From 6ff42dd0b07829eec9ac0e934c6616ff7eaf48d7 Mon Sep 17 00:00:00 2001 From: HongchengQ Date: Wed, 2 Oct 2024 23:21:24 +0800 Subject: [PATCH 1/3] Update(5.0): protocol definitions --- .../AbilityActionCreateGadgetOuterClass.java | 106 +- ...ilityActionGenerateElemBallOuterClass.java | 472 +- ...onSetRandomOverrideMapValueOuterClass.java | 20 +- .../net/proto/AbilityBornTypeOuterClass.java | 430 +- .../proto/AbilityChangeNotifyOuterClass.java | 10 + .../AbilityFireworkBornTypeOuterClass.java | 570 ++- ...AbilityInvocationFailNotifyOuterClass.java | 2 + .../AbilityInvokeArgumentOuterClass.java | 1030 ++-- .../proto/AbilityInvokeEntryOuterClass.java | 4 +- .../AbilityMetaAddAbilityOuterClass.java | 44 +- .../AbilityMetaModifierChangeOuterClass.java | 1666 ++++--- ...bilityMetaReInitOverrideMapOuterClass.java | 72 +- .../AbilityMetaSetKilledStateOuterClass.java | 28 +- .../AbilityScalarValueEntryOuterClass.java | 680 +-- .../AchievementUpdateNotifyOuterClass.java | 74 +- .../AddBackupAvatarTeamRspOuterClass.java | 2 + .../AddNoGachaAvatarCardNotifyOuterClass.java | 50 + ...GachaAvatarCardTransferItemOuterClass.java | 8 + .../net/proto/AiSyncInfoOuterClass.java | 96 +- .../net/proto/AiThreatInfoOuterClass.java | 56 +- .../net/proto/AntiAddictNotifyOuterClass.java | 184 +- .../net/proto/AskAddFriendRspOuterClass.java | 162 +- .../net/proto/AvatarAddNotifyOuterClass.java | 12 + .../AvatarChangeElementTypeReqOuterClass.java | 130 +- .../net/proto/AvatarDelNotifyOuterClass.java | 46 +- .../AvatarFetterDataNotifyOuterClass.java | 8 - .../AvatarFetterLevelRewardReqOuterClass.java | 2 + .../AvatarFetterLevelRewardRspOuterClass.java | 2 + .../AvatarFightPropNotifyOuterClass.java | 2 + ...AvatarFightPropUpdateNotifyOuterClass.java | 2 + .../net/proto/AvatarPromoteReqOuterClass.java | 12 + .../net/proto/AvatarPromoteRspOuterClass.java | 10 + .../net/proto/AvatarRenameInfoOuterClass.java | 112 +- .../AvatarSatiationDataNotifyOuterClass.java | 2 + .../proto/AvatarSatiationDataOuterClass.java | 8 + .../AvatarSkillChangeNotifyOuterClass.java | 2 + ...vatarSkillDepotChangeNotifyOuterClass.java | 2 + .../AvatarSkillInfoNotifyOuterClass.java | 2 + ...arSkillMaxChargeCountNotifyOuterClass.java | 2 + .../AvatarUnlockTalentNotifyOuterClass.java | 8 + .../BattlePassRewardTakeOptionOuterClass.java | 147 +- .../proto/BladeDanceSettleInfoOuterClass.java | 286 +- .../BlossomBriefInfoNotifyOuterClass.java | 72 +- .../net/proto/BlossomBriefInfoOuterClass.java | 1060 +++-- .../net/proto/BuyGoodsReqOuterClass.java | 10 + .../net/proto/BuyGoodsRspOuterClass.java | 10 + .../net/proto/BuyResinRspOuterClass.java | 142 +- ...WeaponUpgradeReturnItemsReqOuterClass.java | 8 + .../CardProductRewardNotifyOuterClass.java | 284 +- .../proto/ChangeGameTimeReqOuterClass.java | 172 +- .../proto/ChangeGameTimeRspOuterClass.java | 148 +- .../net/proto/ChangeHpDebtsOuterClass.java | 12 +- .../net/proto/ChangeHpReasonOuterClass.java | 416 +- .../ChangeMpTeamAvatarReqOuterClass.java | 2 + .../ChangeMpTeamAvatarRspOuterClass.java | 2 + ...annellerSlabLoopDungeonInfoOuterClass.java | 398 +- .../ChooseCurAvatarTeamReqOuterClass.java | 2 + .../ChooseCurAvatarTeamRspOuterClass.java | 4 + .../proto/ClientAIStateNotifyOuterClass.java | 48 +- ...tiesInitFinishCombineNotifyOuterClass.java | 74 +- .../ClientQuitGameServerNotifyOuterClass.java | 548 +++ .../ClientScriptEventNotifyOuterClass.java | 414 +- .../CombineFormulaDataNotifyOuterClass.java | 130 +- .../net/proto/CombineReqOuterClass.java | 142 +- .../net/proto/CombineRspOuterClass.java | 2094 ++++++--- .../proto/CompoundDataNotifyOuterClass.java | 142 +- .../proto/CompoundQueueDataOuterClass.java | 42 +- .../proto/CompoundUnlockNotifyOuterClass.java | 28 +- .../net/proto/CookRecipeDataOuterClass.java | 28 +- .../net/proto/CoopCgOuterClass.java | 138 +- .../net/proto/CoopChapterOuterClass.java | 1808 +++---- .../CoopChapterUpdateNotifyOuterClass.java | 74 +- .../net/proto/CoopDataNotifyOuterClass.java | 474 +- .../net/proto/CoopPointOuterClass.java | 227 +- .../net/proto/CoopRewardOuterClass.java | 93 +- .../net/proto/CreateEntityInfoOuterClass.java | 272 +- .../net/proto/CreateGadgetInfoOuterClass.java | 661 ++- ...rystalLinkDungeonSettleInfoOuterClass.java | 498 +- .../DelBackupAvatarTeamReqOuterClass.java | 2 + .../DelBackupAvatarTeamRspOuterClass.java | 2 + ...elScenePlayTeamEntityNotifyOuterClass.java | 30 +- .../proto/DelTeamEntityNotifyOuterClass.java | 66 +- .../proto/DestroyMaterialReqOuterClass.java | 74 +- .../proto/DestroyMaterialRspOuterClass.java | 140 +- .../net/proto/DropHintNotifyOuterClass.java | 2 + ...ngeonEntryToBeExploreNotifyOuterClass.java | 150 +- .../proto/DungeonPlayerDieReqOuterClass.java | 56 +- .../proto/DungeonRestartRspOuterClass.java | 142 +- ...DungeonSettleExhibitionInfoOuterClass.java | 10 - .../proto/DungeonSettleNotifyOuterClass.java | 4180 ++++++++++++++++- .../DungeonWayPointNotifyOuterClass.java | 80 +- ...EffigyChallengeV2SettleInfoOuterClass.java | 443 +- ...EnterTransPointRegionNotifyOuterClass.java | 142 +- ...ialAvatarActivityDungeonRspOuterClass.java | 174 +- .../EntityAbilityInvokeEntryOuterClass.java | 212 +- .../proto/EntityAiSyncNotifyOuterClass.java | 74 +- ...FightPropChangeReasonNotifyOuterClass.java | 4 +- ...iSyncCombatThreatInfoNotifyOuterClass.java | 56 +- .../EvtAvatarEnterFocusNotifyOuterClass.java | 1042 ++-- .../EvtAvatarExitFocusNotifyOuterClass.java | 334 +- .../EvtAvatarSitDownNotifyOuterClass.java | 2 + .../EvtAvatarUpdateFocusNotifyOuterClass.java | 112 +- ...ntityRenderersChangedNotifyOuterClass.java | 2 + .../proto/ExecuteGadgetLuaReqOuterClass.java | 258 +- .../ExitTransPointRegionNotifyOuterClass.java | 144 +- .../net/proto/ForgeDataNotifyOuterClass.java | 284 +- .../ForgeFormulaDataNotifyOuterClass.java | 58 +- .../proto/ForgeGetQueueDataRspOuterClass.java | 198 +- .../proto/ForgeQueueDataNotifyOuterClass.java | 92 +- .../net/proto/ForgeQueueDataOuterClass.java | 320 +- .../net/proto/ForgeStartReqOuterClass.java | 160 +- .../FungusFighterV2SettleInfoOuterClass.java | 430 +- .../proto/FurnitureMakeDataOuterClass.java | 266 +- .../proto/FurnitureMakeSlotOuterClass.java | 70 +- .../FurnitureMakeStartRspOuterClass.java | 188 +- .../net/proto/GachaInfoOuterClass.java | 488 +- .../net/proto/GachaWishReqOuterClass.java | 2 + .../net/proto/GachaWishRspOuterClass.java | 486 +- .../net/proto/GetAllMailReqOuterClass.java | 28 +- .../net/proto/GetAuthkeyReqOuterClass.java | 250 +- .../net/proto/GetAuthkeyRspOuterClass.java | 450 +- .../proto/GetCompoundDataRspOuterClass.java | 472 +- ...GetDailyDungeonEntryInfoReqOuterClass.java | 26 +- ...eonEntryExploreConditionReqOuterClass.java | 182 +- .../proto/GetShopmallDataRspOuterClass.java | 10 + .../proto/GetWorldMpInfoRspOuterClass.java | 78 +- .../proto/GivingRecordNotifyOuterClass.java | 8 +- .../net/proto/GivingRecordOuterClass.java | 622 +-- .../net/proto/GmTalkRspOuterClass.java | 330 +- .../HitClientTrivialNotifyOuterClass.java | 2 + ...tableSprayDungeonSettleInfoOuterClass.java | 620 ++- .../net/proto/LevelupCityReqOuterClass.java | 186 +- .../net/proto/LevelupCityRspOuterClass.java | 330 +- .../LockedPersonallineDataOuterClass.java | 644 +-- .../net/proto/MIMFBKCDIAKOuterClass.java | 545 +++ .../net/proto/MainCoopOuterClass.java | 1488 +++--- ...eEntityElementOpBatchNotifyOuterClass.java | 684 +-- .../net/proto/MaterialInfoOuterClass.java | 40 +- .../McoinExchangeHcoinReqOuterClass.java | 60 +- .../McoinExchangeHcoinRspOuterClass.java | 182 +- .../net/proto/MeetNpcReqOuterClass.java | 28 +- .../net/proto/ModifierActionOuterClass.java | 10 +- .../net/proto/ModifierPropertyOuterClass.java | 64 +- .../MonsterAIConfigHashNotifyOuterClass.java | 148 +- .../MonsterAlertChangeNotifyOuterClass.java | 304 +- .../MonsterSummonTagNotifyOuterClass.java | 198 +- .../net/proto/MsgParamOuterClass.java | 454 +- ...iCharacterDungeonSettleInfoOuterClass.java | 1096 +++-- .../proto/MusicGameSettleReqOuterClass.java | 1548 +++--- .../proto/MusicGameSettleRspOuterClass.java | 212 +- .../proto/MusicGameStartReqOuterClass.java | 184 +- .../proto/MusicGameStartRspOuterClass.java | 76 +- .../net/proto/PacmanSettleInfoOuterClass.java | 368 +- .../net/proto/ParamListOuterClass.java | 8 - .../PersonalLineAllDataRspOuterClass.java | 1056 +++-- .../proto/PersonalSceneJumpRspOuterClass.java | 220 +- .../PlatformStartRouteNotifyOuterClass.java | 182 +- .../PlayerApplyEnterHomeNotifyOuterClass.java | 188 +- ...rApplyEnterHomeResultNotifyOuterClass.java | 404 +- ...ayerApplyEnterHomeResultReqOuterClass.java | 56 +- ...ayerApplyEnterHomeResultRspOuterClass.java | 258 +- .../PlayerCompoundMaterialReqOuterClass.java | 142 +- .../PlayerCompoundMaterialRspOuterClass.java | 84 +- .../proto/PlayerCookArgsReqOuterClass.java | 130 +- .../net/proto/PlayerCookReqOuterClass.java | 144 +- .../net/proto/PlayerCookRspOuterClass.java | 1064 ++--- .../ProudSkillChangeNotifyOuterClass.java | 10 + .../ProudSkillExtraLevelNotifyOuterClass.java | 30 + .../proto/QuestCreateEntityReqOuterClass.java | 414 +- .../proto/QuestCreateEntityRspOuterClass.java | 352 +- .../net/proto/QuestDelNotifyOuterClass.java | 28 +- .../QuestDestroyEntityReqOuterClass.java | 172 +- .../QuestDestroyEntityRspOuterClass.java | 268 +- .../proto/QuestGlobalVarNotifyOuterClass.java | 74 +- .../net/proto/QuestGlobalVarOuterClass.java | 54 +- .../net/proto/QuestTransmitReqOuterClass.java | 190 +- .../net/proto/QuestTransmitRspOuterClass.java | 8 + .../QuestUpdateQuestVarReqOuterClass.java | 264 +- .../QuestUpdateQuestVarRspOuterClass.java | 194 +- .../net/proto/QuestVarOpOuterClass.java | 178 +- ...rialAvatarActivityRewardReqOuterClass.java | 26 +- ...rialAvatarActivityRewardRspOuterClass.java | 156 +- .../ReliquaryDecomposeReqOuterClass.java | 296 +- .../ReliquaryDecomposeRspOuterClass.java | 170 +- .../proto/ReliquaryUpgradeReqOuterClass.java | 94 +- .../proto/ReliquaryUpgradeRspOuterClass.java | 580 ++- .../RoguelikeDungeonSettleInfoOuterClass.java | 859 ++-- .../SceneEntityMoveNotifyOuterClass.java | 184 +- .../SceneEntityUpdateNotifyOuterClass.java | 8 +- .../proto/SceneKickPlayerReqOuterClass.java | 30 +- .../proto/SceneKickPlayerRspOuterClass.java | 44 +- .../ScenePlayerSoundNotifyOuterClass.java | 328 +- .../ScenePointUnlockNotifyOuterClass.java | 340 +- .../SceneWeatherForcastReqOuterClass.java | 28 +- .../SetBattlePassViewedReqOuterClass.java | 28 +- .../SetBattlePassViewedRspOuterClass.java | 140 +- .../SetCoopChapterViewedRspOuterClass.java | 128 +- .../proto/SetPlayerBornDataRspOuterClass.java | 8 + .../net/proto/ShapeBoxOuterClass.java | 8 - .../net/proto/ShapeSphereOuterClass.java | 8 - .../net/proto/ShopGoodsOuterClass.java | 1624 ++++--- .../proto/ShowCommonTipsNotifyOuterClass.java | 178 +- .../proto/ShowMessageNotifyOuterClass.java | 234 +- .../SkipPlayerGameTimeReqOuterClass.java | 2 + .../SkipPlayerGameTimeRspOuterClass.java | 210 +- .../proto/StartCoopPointReqOuterClass.java | 28 +- .../proto/StartCoopPointRspOuterClass.java | 350 +- .../proto/StoreItemDelNotifyOuterClass.java | 10 + .../proto/StrengthenPointDataOuterClass.java | 8 - ...mmerTimeV2DungeonSettleInfoOuterClass.java | 210 +- .../net/proto/SvrMsgIdOuterClass.java | 20 +- ...akeAchievementGoalRewardReqOuterClass.java | 42 +- ...akeAchievementGoalRewardRspOuterClass.java | 282 +- .../TakeAchievementRewardReqOuterClass.java | 42 +- .../TakeAchievementRewardRspOuterClass.java | 546 ++- ...keBattlePassMissionPointReqOuterClass.java | 44 +- .../TakeBattlePassRewardReqOuterClass.java | 74 +- .../TakeBattlePassRewardRspOuterClass.java | 748 +-- .../TakeCompoundOutputReqOuterClass.java | 125 +- .../TakeCompoundOutputRspOuterClass.java | 92 +- .../proto/TakeFurnitureMakeReqOuterClass.java | 182 +- .../proto/TakeFurnitureMakeRspOuterClass.java | 834 ++-- .../TakePlayerLevelRewardReqOuterClass.java | 2 + .../TakePlayerLevelRewardRspOuterClass.java | 2 + .../net/proto/TakeoffEquipReqOuterClass.java | 58 +- .../net/proto/TakeoffEquipRspOuterClass.java | 146 +- .../proto/TeamChainSettleInfoOuterClass.java | 462 +- .../net/proto/TowerAllDataReqOuterClass.java | 8 + .../net/proto/TowerAllDataRspOuterClass.java | 2819 ++++++----- .../proto/TowerBriefDataNotifyOuterClass.java | 453 +- ...rCurLevelRecordChangeNotifyOuterClass.java | 46 +- .../proto/TowerCurLevelRecordOuterClass.java | 446 +- ...yRewardProgressChangeNotifyOuterClass.java | 154 +- .../proto/TowerEnterLevelReqOuterClass.java | 26 +- .../proto/TowerEnterLevelRspOuterClass.java | 340 +- .../proto/TowerFightRecordPairOuterClass.java | 138 +- ...owerFloorRecordChangeNotifyOuterClass.java | 108 +- .../net/proto/TowerFloorRecordOuterClass.java | 788 ++-- .../TowerGetFloorStarRewardReqOuterClass.java | 26 +- .../TowerGetFloorStarRewardRspOuterClass.java | 140 +- .../proto/TowerLevelEndNotifyOuterClass.java | 150 +- .../net/proto/TowerLevelRecordOuterClass.java | 82 +- .../TowerLevelStarCondDataOuterClass.java | 380 +- .../TowerLevelStarCondNotifyOuterClass.java | 236 +- .../proto/TowerMonthlyBriefOuterClass.java | 290 +- .../TowerMonthlyCombatRecordOuterClass.java | 1526 +++--- .../proto/TowerMonthlyDetailOuterClass.java | 256 +- .../TowerRecordHandbookRspOuterClass.java | 92 +- .../net/proto/TowerTeamOuterClass.java | 170 +- .../proto/TowerTeamSelectReqOuterClass.java | 90 +- ...vatarFirstPassDungeonNotifyOuterClass.java | 8 +- .../net/proto/UgcMusicNoteOuterClass.java | 138 +- .../UnlockAvatarTalentReqOuterClass.java | 12 + .../UnlockAvatarTalentRspOuterClass.java | 12 + .../proto/UnlockNameCardNotifyOuterClass.java | 28 +- .../UnlockPersonalLineReqOuterClass.java | 26 +- .../UnlockPersonalLineRspOuterClass.java | 250 +- .../proto/UnlockTransPointRspOuterClass.java | 28 +- .../net/proto/WeaponUpgradeReqOuterClass.java | 8 + .../proto/WidgetCoolDownDataOuterClass.java | 158 +- .../proto/WidgetCoolDownNotifyOuterClass.java | 364 +- .../WindFieldDungeonSettleInfoOuterClass.java | 552 ++- .../proto/WorldChestOpenNotifyOuterClass.java | 182 +- 263 files changed, 37082 insertions(+), 29780 deletions(-) create mode 100644 src/generated/main/java/emu/grasscutter/net/proto/ClientQuitGameServerNotifyOuterClass.java create mode 100644 src/generated/main/java/emu/grasscutter/net/proto/MIMFBKCDIAKOuterClass.java diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionCreateGadgetOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionCreateGadgetOuterClass.java index 8a91ab50f08..40d699d6f56 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionCreateGadgetOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionCreateGadgetOuterClass.java @@ -19,32 +19,32 @@ public interface AbilityActionCreateGadgetOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector pos = 10; + * .Vector pos = 2; * @return Whether the pos field is set. */ boolean hasPos(); /** - * .Vector pos = 10; + * .Vector pos = 2; * @return The pos. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); /** - * .Vector pos = 10; + * .Vector pos = 2; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); /** - * .Vector rot = 12; + * .Vector rot = 6; * @return Whether the rot field is set. */ boolean hasRot(); /** - * .Vector rot = 12; + * .Vector rot = 6; * @return The rot. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); /** - * .Vector rot = 12; + * .Vector rot = 6; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); @@ -56,7 +56,7 @@ public interface AbilityActionCreateGadgetOrBuilder extends } /** * 
-   * Obf: BAFEPPHIOGH
+   * obf: BOGAPPBNKCD
    *
* * Protobuf type {@code AbilityActionCreateGadget} @@ -103,12 +103,7 @@ private AbilityActionCreateGadget( case 0: done = true; break; - case 56: { - - roomId_ = input.readUInt32(); - break; - } - case 82: { + case 18: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (pos_ != null) { subBuilder = pos_.toBuilder(); @@ -121,7 +116,7 @@ private AbilityActionCreateGadget( break; } - case 98: { + case 50: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (rot_ != null) { subBuilder = rot_.toBuilder(); @@ -134,6 +129,11 @@ private AbilityActionCreateGadget( break; } + case 56: { + + roomId_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -166,10 +166,10 @@ private AbilityActionCreateGadget( emu.grasscutter.net.proto.AbilityActionCreateGadgetOuterClass.AbilityActionCreateGadget.class, emu.grasscutter.net.proto.AbilityActionCreateGadgetOuterClass.AbilityActionCreateGadget.Builder.class); } - public static final int POS_FIELD_NUMBER = 10; + public static final int POS_FIELD_NUMBER = 2; private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; /** - * .Vector pos = 10; + * .Vector pos = 2; * @return Whether the pos field is set. */ @java.lang.Override @@ -177,7 +177,7 @@ public boolean hasPos() { return pos_ != null; } /** - * .Vector pos = 10; + * .Vector pos = 2; * @return The pos. */ @java.lang.Override @@ -185,17 +185,17 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; } /** - * .Vector pos = 10; + * .Vector pos = 2; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { return getPos(); } - public static final int ROT_FIELD_NUMBER = 12; + public static final int ROT_FIELD_NUMBER = 6; private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; /** - * .Vector rot = 12; + * .Vector rot = 6; * @return Whether the rot field is set. */ @java.lang.Override @@ -203,7 +203,7 @@ public boolean hasRot() { return rot_ != null; } /** - * .Vector rot = 12; + * .Vector rot = 6; * @return The rot. */ @java.lang.Override @@ -211,7 +211,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } /** - * .Vector rot = 12; + * .Vector rot = 6; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { @@ -243,14 +243,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (roomId_ != 0) { - output.writeUInt32(7, roomId_); - } if (pos_ != null) { - output.writeMessage(10, getPos()); + output.writeMessage(2, getPos()); } if (rot_ != null) { - output.writeMessage(12, getRot()); + output.writeMessage(6, getRot()); + } + if (roomId_ != 0) { + output.writeUInt32(7, roomId_); } unknownFields.writeTo(output); } @@ -261,17 +261,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (roomId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, roomId_); - } if (pos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, getPos()); + .computeMessageSize(2, getPos()); } if (rot_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, getRot()); + .computeMessageSize(6, getRot()); + } + if (roomId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(7, roomId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -418,7 +418,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: BAFEPPHIOGH
+     * obf: BOGAPPBNKCD
      *
* * Protobuf type {@code AbilityActionCreateGadget} @@ -599,14 +599,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; /** - * .Vector pos = 10; + * .Vector pos = 2; * @return Whether the pos field is set. */ public boolean hasPos() { return posBuilder_ != null || pos_ != null; } /** - * .Vector pos = 10; + * .Vector pos = 2; * @return The pos. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { @@ -617,7 +617,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { } } /** - * .Vector pos = 10; + * .Vector pos = 2; */ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (posBuilder_ == null) { @@ -633,7 +633,7 @@ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { return this; } /** - * .Vector pos = 10; + * .Vector pos = 2; */ public Builder setPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -647,7 +647,7 @@ public Builder setPos( return this; } /** - * .Vector pos = 10; + * .Vector pos = 2; */ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (posBuilder_ == null) { @@ -665,7 +665,7 @@ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) return this; } /** - * .Vector pos = 10; + * .Vector pos = 2; */ public Builder clearPos() { if (posBuilder_ == null) { @@ -679,7 +679,7 @@ public Builder clearPos() { return this; } /** - * .Vector pos = 10; + * .Vector pos = 2; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { @@ -687,7 +687,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() return getPosFieldBuilder().getBuilder(); } /** - * .Vector pos = 10; + * .Vector pos = 2; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { if (posBuilder_ != null) { @@ -698,7 +698,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde } } /** - * .Vector pos = 10; + * .Vector pos = 2; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -718,14 +718,14 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; /** - * .Vector rot = 12; + * .Vector rot = 6; * @return Whether the rot field is set. */ public boolean hasRot() { return rotBuilder_ != null || rot_ != null; } /** - * .Vector rot = 12; + * .Vector rot = 6; * @return The rot. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { @@ -736,7 +736,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { } } /** - * .Vector rot = 12; + * .Vector rot = 6; */ public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (rotBuilder_ == null) { @@ -752,7 +752,7 @@ public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { return this; } /** - * .Vector rot = 12; + * .Vector rot = 6; */ public Builder setRot( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -766,7 +766,7 @@ public Builder setRot( return this; } /** - * .Vector rot = 12; + * .Vector rot = 6; */ public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (rotBuilder_ == null) { @@ -784,7 +784,7 @@ public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) return this; } /** - * .Vector rot = 12; + * .Vector rot = 6; */ public Builder clearRot() { if (rotBuilder_ == null) { @@ -798,7 +798,7 @@ public Builder clearRot() { return this; } /** - * .Vector rot = 12; + * .Vector rot = 6; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { @@ -806,7 +806,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() return getRotFieldBuilder().getBuilder(); } /** - * .Vector rot = 12; + * .Vector rot = 6; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { if (rotBuilder_ != null) { @@ -817,7 +817,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilde } } /** - * .Vector rot = 12; + * .Vector rot = 6; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -932,7 +932,7 @@ public emu.grasscutter.net.proto.AbilityActionCreateGadgetOuterClass.AbilityActi java.lang.String[] descriptorData = { "\n\037AbilityActionCreateGadget.proto\032\014Vecto" + "r.proto\"X\n\031AbilityActionCreateGadget\022\024\n\003" + - "pos\030\n \001(\0132\007.Vector\022\024\n\003rot\030\014 \001(\0132\007.Vector" + + "pos\030\002 \001(\0132\007.Vector\022\024\n\003rot\030\006 \001(\0132\007.Vector" + "\022\017\n\007room_id\030\007 \001(\rB\033\n\031emu.grasscutter.net" + ".protob\006proto3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionGenerateElemBallOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionGenerateElemBallOuterClass.java index 4b17dd57f02..1f1132084c9 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionGenerateElemBallOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionGenerateElemBallOuterClass.java @@ -19,44 +19,44 @@ public interface AbilityActionGenerateElemBallOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector pos = 4; - * @return Whether the pos field is set. - */ - boolean hasPos(); - /** - * .Vector pos = 4; - * @return The pos. - */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); - /** - * .Vector pos = 4; - */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); - - /** - * uint32 room_id = 6; + * uint32 room_id = 2; * @return The roomId. */ int getRoomId(); /** - * .Vector rot = 9; + * .Vector rot = 4; * @return Whether the rot field is set. */ boolean hasRot(); /** - * .Vector rot = 9; + * .Vector rot = 4; * @return The rot. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); /** - * .Vector rot = 9; + * .Vector rot = 4; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); + + /** + * .Vector pos = 9; + * @return Whether the pos field is set. + */ + boolean hasPos(); + /** + * .Vector pos = 9; + * @return The pos. + */ + emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); + /** + * .Vector pos = 9; + */ + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); } /** * 
-   * Obf: OBEOLIIBNAF
+   * obf: NPLNEGAKLNI
    *
* * Protobuf type {@code AbilityActionGenerateElemBall} @@ -103,25 +103,12 @@ private AbilityActionGenerateElemBall( case 0: done = true; break; - case 34: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (pos_ != null) { - subBuilder = pos_.toBuilder(); - } - pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(pos_); - pos_ = subBuilder.buildPartial(); - } - - break; - } - case 48: { + case 16: { roomId_ = input.readUInt32(); break; } - case 74: { + case 34: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (rot_ != null) { subBuilder = rot_.toBuilder(); @@ -134,6 +121,19 @@ private AbilityActionGenerateElemBall( break; } + case 74: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (pos_ != null) { + subBuilder = pos_.toBuilder(); + } + pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(pos_); + pos_ = subBuilder.buildPartial(); + } + + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -166,36 +166,10 @@ private AbilityActionGenerateElemBall( emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall.class, emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall.Builder.class); } - public static final int POS_FIELD_NUMBER = 4; - private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; - /** - * .Vector pos = 4; - * @return Whether the pos field is set. - */ - @java.lang.Override - public boolean hasPos() { - return pos_ != null; - } - /** - * .Vector pos = 4; - * @return The pos. - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { - return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } - /** - * .Vector pos = 4; - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { - return getPos(); - } - - public static final int ROOM_ID_FIELD_NUMBER = 6; + public static final int ROOM_ID_FIELD_NUMBER = 2; private int roomId_; /** - * uint32 room_id = 6; + * uint32 room_id = 2; * @return The roomId. */ @java.lang.Override @@ -203,10 +177,10 @@ public int getRoomId() { return roomId_; } - public static final int ROT_FIELD_NUMBER = 9; + public static final int ROT_FIELD_NUMBER = 4; private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; /** - * .Vector rot = 9; + * .Vector rot = 4; * @return Whether the rot field is set. */ @java.lang.Override @@ -214,7 +188,7 @@ public boolean hasRot() { return rot_ != null; } /** - * .Vector rot = 9; + * .Vector rot = 4; * @return The rot. */ @java.lang.Override @@ -222,13 +196,39 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } /** - * .Vector rot = 9; + * .Vector rot = 4; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { return getRot(); } + public static final int POS_FIELD_NUMBER = 9; + private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; + /** + * .Vector pos = 9; + * @return Whether the pos field is set. + */ + @java.lang.Override + public boolean hasPos() { + return pos_ != null; + } + /** + * .Vector pos = 9; + * @return The pos. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { + return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } + /** + * .Vector pos = 9; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { + return getPos(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -243,14 +243,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (pos_ != null) { - output.writeMessage(4, getPos()); - } if (roomId_ != 0) { - output.writeUInt32(6, roomId_); + output.writeUInt32(2, roomId_); } if (rot_ != null) { - output.writeMessage(9, getRot()); + output.writeMessage(4, getRot()); + } + if (pos_ != null) { + output.writeMessage(9, getPos()); } unknownFields.writeTo(output); } @@ -261,17 +261,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (pos_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getPos()); - } if (roomId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, roomId_); + .computeUInt32Size(2, roomId_); } if (rot_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, getRot()); + .computeMessageSize(4, getRot()); + } + if (pos_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(9, getPos()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -288,11 +288,6 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall other = (emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall) obj; - if (hasPos() != other.hasPos()) return false; - if (hasPos()) { - if (!getPos() - .equals(other.getPos())) return false; - } if (getRoomId() != other.getRoomId()) return false; if (hasRot() != other.hasRot()) return false; @@ -300,6 +295,11 @@ public boolean equals(final java.lang.Object obj) { if (!getRot() .equals(other.getRot())) return false; } + if (hasPos() != other.hasPos()) return false; + if (hasPos()) { + if (!getPos() + .equals(other.getPos())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -311,16 +311,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasPos()) { - hash = (37 * hash) + POS_FIELD_NUMBER; - hash = (53 * hash) + getPos().hashCode(); - } hash = (37 * hash) + ROOM_ID_FIELD_NUMBER; hash = (53 * hash) + getRoomId(); if (hasRot()) { hash = (37 * hash) + ROT_FIELD_NUMBER; hash = (53 * hash) + getRot().hashCode(); } + if (hasPos()) { + hash = (37 * hash) + POS_FIELD_NUMBER; + hash = (53 * hash) + getPos().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -418,7 +418,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: OBEOLIIBNAF
+     * obf: NPLNEGAKLNI
      *
* * Protobuf type {@code AbilityActionGenerateElemBall} @@ -458,12 +458,6 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (posBuilder_ == null) { - pos_ = null; - } else { - pos_ = null; - posBuilder_ = null; - } roomId_ = 0; if (rotBuilder_ == null) { @@ -472,6 +466,12 @@ public Builder clear() { rot_ = null; rotBuilder_ = null; } + if (posBuilder_ == null) { + pos_ = null; + } else { + pos_ = null; + posBuilder_ = null; + } return this; } @@ -498,17 +498,17 @@ public emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.Ability @java.lang.Override public emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall buildPartial() { emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall result = new emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall(this); - if (posBuilder_ == null) { - result.pos_ = pos_; - } else { - result.pos_ = posBuilder_.build(); - } result.roomId_ = roomId_; if (rotBuilder_ == null) { result.rot_ = rot_; } else { result.rot_ = rotBuilder_.build(); } + if (posBuilder_ == null) { + result.pos_ = pos_; + } else { + result.pos_ = posBuilder_.build(); + } onBuilt(); return result; } @@ -557,15 +557,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall other) { if (other == emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.AbilityActionGenerateElemBall.getDefaultInstance()) return this; - if (other.hasPos()) { - mergePos(other.getPos()); - } if (other.getRoomId() != 0) { setRoomId(other.getRoomId()); } if (other.hasRot()) { mergeRot(other.getRot()); } + if (other.hasPos()) { + mergePos(other.getPos()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -595,128 +595,9 @@ public Builder mergeFrom( return this; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; - /** - * .Vector pos = 4; - * @return Whether the pos field is set. - */ - public boolean hasPos() { - return posBuilder_ != null || pos_ != null; - } - /** - * .Vector pos = 4; - * @return The pos. - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { - if (posBuilder_ == null) { - return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } else { - return posBuilder_.getMessage(); - } - } - /** - * .Vector pos = 4; - */ - public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (posBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - pos_ = value; - onChanged(); - } else { - posBuilder_.setMessage(value); - } - - return this; - } - /** - * .Vector pos = 4; - */ - public Builder setPos( - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (posBuilder_ == null) { - pos_ = builderForValue.build(); - onChanged(); - } else { - posBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .Vector pos = 4; - */ - public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (posBuilder_ == null) { - if (pos_ != null) { - pos_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial(); - } else { - pos_ = value; - } - onChanged(); - } else { - posBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .Vector pos = 4; - */ - public Builder clearPos() { - if (posBuilder_ == null) { - pos_ = null; - onChanged(); - } else { - pos_ = null; - posBuilder_ = null; - } - - return this; - } - /** - * .Vector pos = 4; - */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { - - onChanged(); - return getPosFieldBuilder().getBuilder(); - } - /** - * .Vector pos = 4; - */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { - if (posBuilder_ != null) { - return posBuilder_.getMessageOrBuilder(); - } else { - return pos_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } - } - /** - * .Vector pos = 4; - */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getPosFieldBuilder() { - if (posBuilder_ == null) { - posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getPos(), - getParentForChildren(), - isClean()); - pos_ = null; - } - return posBuilder_; - } - private int roomId_ ; /** - * uint32 room_id = 6; + * uint32 room_id = 2; * @return The roomId. */ @java.lang.Override @@ -724,7 +605,7 @@ public int getRoomId() { return roomId_; } /** - * uint32 room_id = 6; + * uint32 room_id = 2; * @param value The roomId to set. * @return This builder for chaining. */ @@ -735,7 +616,7 @@ public Builder setRoomId(int value) { return this; } /** - * uint32 room_id = 6; + * uint32 room_id = 2; * @return This builder for chaining. */ public Builder clearRoomId() { @@ -749,14 +630,14 @@ public Builder clearRoomId() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; /** - * .Vector rot = 9; + * .Vector rot = 4; * @return Whether the rot field is set. */ public boolean hasRot() { return rotBuilder_ != null || rot_ != null; } /** - * .Vector rot = 9; + * .Vector rot = 4; * @return The rot. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { @@ -767,7 +648,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { } } /** - * .Vector rot = 9; + * .Vector rot = 4; */ public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (rotBuilder_ == null) { @@ -783,7 +664,7 @@ public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { return this; } /** - * .Vector rot = 9; + * .Vector rot = 4; */ public Builder setRot( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -797,7 +678,7 @@ public Builder setRot( return this; } /** - * .Vector rot = 9; + * .Vector rot = 4; */ public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (rotBuilder_ == null) { @@ -815,7 +696,7 @@ public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) return this; } /** - * .Vector rot = 9; + * .Vector rot = 4; */ public Builder clearRot() { if (rotBuilder_ == null) { @@ -829,7 +710,7 @@ public Builder clearRot() { return this; } /** - * .Vector rot = 9; + * .Vector rot = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { @@ -837,7 +718,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() return getRotFieldBuilder().getBuilder(); } /** - * .Vector rot = 9; + * .Vector rot = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { if (rotBuilder_ != null) { @@ -848,7 +729,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilde } } /** - * .Vector rot = 9; + * .Vector rot = 4; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -863,6 +744,125 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilde } return rotBuilder_; } + + private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; + /** + * .Vector pos = 9; + * @return Whether the pos field is set. + */ + public boolean hasPos() { + return posBuilder_ != null || pos_ != null; + } + /** + * .Vector pos = 9; + * @return The pos. + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { + if (posBuilder_ == null) { + return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } else { + return posBuilder_.getMessage(); + } + } + /** + * .Vector pos = 9; + */ + public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (posBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + pos_ = value; + onChanged(); + } else { + posBuilder_.setMessage(value); + } + + return this; + } + /** + * .Vector pos = 9; + */ + public Builder setPos( + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { + if (posBuilder_ == null) { + pos_ = builderForValue.build(); + onChanged(); + } else { + posBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .Vector pos = 9; + */ + public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (posBuilder_ == null) { + if (pos_ != null) { + pos_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial(); + } else { + pos_ = value; + } + onChanged(); + } else { + posBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .Vector pos = 9; + */ + public Builder clearPos() { + if (posBuilder_ == null) { + pos_ = null; + onChanged(); + } else { + pos_ = null; + posBuilder_ = null; + } + + return this; + } + /** + * .Vector pos = 9; + */ + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { + + onChanged(); + return getPosFieldBuilder().getBuilder(); + } + /** + * .Vector pos = 9; + */ + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { + if (posBuilder_ != null) { + return posBuilder_.getMessageOrBuilder(); + } else { + return pos_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } + } + /** + * .Vector pos = 9; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> + getPosFieldBuilder() { + if (posBuilder_ == null) { + posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( + getPos(), + getParentForChildren(), + isClean()); + pos_ = null; + } + return posBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -932,8 +932,8 @@ public emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.Ability java.lang.String[] descriptorData = { "\n#AbilityActionGenerateElemBall.proto\032\014V" + "ector.proto\"\\\n\035AbilityActionGenerateElem" + - "Ball\022\024\n\003pos\030\004 \001(\0132\007.Vector\022\017\n\007room_id\030\006 " + - "\001(\r\022\024\n\003rot\030\t \001(\0132\007.VectorB\033\n\031emu.grasscu" + + "Ball\022\017\n\007room_id\030\002 \001(\r\022\024\n\003rot\030\004 \001(\0132\007.Vec" + + "tor\022\024\n\003pos\030\t \001(\0132\007.VectorB\033\n\031emu.grasscu" + "tter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -946,7 +946,7 @@ public emu.grasscutter.net.proto.AbilityActionGenerateElemBallOuterClass.Ability internal_static_AbilityActionGenerateElemBall_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AbilityActionGenerateElemBall_descriptor, - new java.lang.String[] { "Pos", "RoomId", "Rot", }); + new java.lang.String[] { "RoomId", "Rot", "Pos", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionSetRandomOverrideMapValueOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionSetRandomOverrideMapValueOuterClass.java index d0d9b5a89aa..22d49a1f6dc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionSetRandomOverrideMapValueOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityActionSetRandomOverrideMapValueOuterClass.java @@ -19,7 +19,7 @@ public interface AbilityActionSetRandomOverrideMapValueOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * float random_value = 1; + * float random_value = 2; * @return The randomValue. */ float getRandomValue(); @@ -69,7 +69,7 @@ private AbilityActionSetRandomOverrideMapValue( case 0: done = true; break; - case 13: { + case 21: { randomValue_ = input.readFloat(); break; @@ -106,10 +106,10 @@ private AbilityActionSetRandomOverrideMapValue( emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.class, emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClass.AbilityActionSetRandomOverrideMapValue.Builder.class); } - public static final int RANDOM_VALUE_FIELD_NUMBER = 1; + public static final int RANDOM_VALUE_FIELD_NUMBER = 2; private float randomValue_; /** - * float random_value = 1; + * float random_value = 2; * @return The randomValue. */ @java.lang.Override @@ -132,7 +132,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (randomValue_ != 0F) { - output.writeFloat(1, randomValue_); + output.writeFloat(2, randomValue_); } unknownFields.writeTo(output); } @@ -145,7 +145,7 @@ public int getSerializedSize() { size = 0; if (randomValue_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(1, randomValue_); + .computeFloatSize(2, randomValue_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -423,7 +423,7 @@ public Builder mergeFrom( private float randomValue_ ; /** - * float random_value = 1; + * float random_value = 2; * @return The randomValue. */ @java.lang.Override @@ -431,7 +431,7 @@ public float getRandomValue() { return randomValue_; } /** - * float random_value = 1; + * float random_value = 2; * @param value The randomValue to set. * @return This builder for chaining. */ @@ -442,7 +442,7 @@ public Builder setRandomValue(float value) { return this; } /** - * float random_value = 1; + * float random_value = 2; * @return This builder for chaining. */ public Builder clearRandomValue() { @@ -520,7 +520,7 @@ public emu.grasscutter.net.proto.AbilityActionSetRandomOverrideMapValueOuterClas java.lang.String[] descriptorData = { "\n,AbilityActionSetRandomOverrideMapValue" + ".proto\">\n&AbilityActionSetRandomOverride" + - "MapValue\022\024\n\014random_value\030\001 \001(\002B\033\n\031emu.gr" + + "MapValue\022\024\n\014random_value\030\002 \001(\002B\033\n\031emu.gr" + "asscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityBornTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityBornTypeOuterClass.java index 13f4ead245f..09152f3d02d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityBornTypeOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityBornTypeOuterClass.java @@ -19,55 +19,51 @@ public interface AbilityBornTypeOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector pos = 3; + * .Vector pos = 8; * @return Whether the pos field is set. */ boolean hasPos(); /** - * .Vector pos = 3; + * .Vector pos = 8; * @return The pos. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); /** - * .Vector pos = 3; + * .Vector pos = 8; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); /** - * .Vector move_dir = 4; - * @return Whether the moveDir field is set. + * .Vector rot = 12; + * @return Whether the rot field is set. */ - boolean hasMoveDir(); + boolean hasRot(); /** - * .Vector move_dir = 4; - * @return The moveDir. + * .Vector rot = 12; + * @return The rot. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); /** - * .Vector rot = 11; - * @return Whether the rot field is set. + * .Vector move_dir = 15; + * @return Whether the moveDir field is set. */ - boolean hasRot(); + boolean hasMoveDir(); /** - * .Vector rot = 11; - * @return The rot. + * .Vector move_dir = 15; + * @return The moveDir. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir(); /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder(); } /** - * 
-   * Obf: AJIIAKCDDHA
-   *
- * * Protobuf type {@code AbilityBornType} */ public static final class AbilityBornType extends @@ -112,7 +108,7 @@ private AbilityBornType( case 0: done = true; break; - case 26: { + case 66: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (pos_ != null) { subBuilder = pos_.toBuilder(); @@ -125,28 +121,28 @@ private AbilityBornType( break; } - case 34: { + case 98: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (moveDir_ != null) { - subBuilder = moveDir_.toBuilder(); + if (rot_ != null) { + subBuilder = rot_.toBuilder(); } - moveDir_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(moveDir_); - moveDir_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(rot_); + rot_ = subBuilder.buildPartial(); } break; } - case 90: { + case 122: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (rot_ != null) { - subBuilder = rot_.toBuilder(); + if (moveDir_ != null) { + subBuilder = moveDir_.toBuilder(); } - rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + moveDir_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(rot_); - rot_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(moveDir_); + moveDir_ = subBuilder.buildPartial(); } break; @@ -183,10 +179,10 @@ private AbilityBornType( emu.grasscutter.net.proto.AbilityBornTypeOuterClass.AbilityBornType.class, emu.grasscutter.net.proto.AbilityBornTypeOuterClass.AbilityBornType.Builder.class); } - public static final int POS_FIELD_NUMBER = 3; + public static final int POS_FIELD_NUMBER = 8; private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; /** - * .Vector pos = 3; + * .Vector pos = 8; * @return Whether the pos field is set. */ @java.lang.Override @@ -194,7 +190,7 @@ public boolean hasPos() { return pos_ != null; } /** - * .Vector pos = 3; + * .Vector pos = 8; * @return The pos. */ @java.lang.Override @@ -202,63 +198,63 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; } /** - * .Vector pos = 3; + * .Vector pos = 8; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { return getPos(); } - public static final int MOVE_DIR_FIELD_NUMBER = 4; - private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; + public static final int ROT_FIELD_NUMBER = 12; + private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; /** - * .Vector move_dir = 4; - * @return Whether the moveDir field is set. + * .Vector rot = 12; + * @return Whether the rot field is set. */ @java.lang.Override - public boolean hasMoveDir() { - return moveDir_ != null; + public boolean hasRot() { + return rot_ != null; } /** - * .Vector move_dir = 4; - * @return The moveDir. + * .Vector rot = 12; + * @return The rot. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { - return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { + return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { - return getMoveDir(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { + return getRot(); } - public static final int ROT_FIELD_NUMBER = 11; - private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; + public static final int MOVE_DIR_FIELD_NUMBER = 15; + private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; /** - * .Vector rot = 11; - * @return Whether the rot field is set. + * .Vector move_dir = 15; + * @return Whether the moveDir field is set. */ @java.lang.Override - public boolean hasRot() { - return rot_ != null; + public boolean hasMoveDir() { + return moveDir_ != null; } /** - * .Vector rot = 11; - * @return The rot. + * .Vector move_dir = 15; + * @return The moveDir. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { - return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { + return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; } /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { - return getRot(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { + return getMoveDir(); } private byte memoizedIsInitialized = -1; @@ -276,13 +272,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (pos_ != null) { - output.writeMessage(3, getPos()); - } - if (moveDir_ != null) { - output.writeMessage(4, getMoveDir()); + output.writeMessage(8, getPos()); } if (rot_ != null) { - output.writeMessage(11, getRot()); + output.writeMessage(12, getRot()); + } + if (moveDir_ != null) { + output.writeMessage(15, getMoveDir()); } unknownFields.writeTo(output); } @@ -295,15 +291,15 @@ public int getSerializedSize() { size = 0; if (pos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getPos()); + .computeMessageSize(8, getPos()); } - if (moveDir_ != null) { + if (rot_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getMoveDir()); + .computeMessageSize(12, getRot()); } - if (rot_ != null) { + if (moveDir_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, getRot()); + .computeMessageSize(15, getMoveDir()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -325,16 +321,16 @@ public boolean equals(final java.lang.Object obj) { if (!getPos() .equals(other.getPos())) return false; } - if (hasMoveDir() != other.hasMoveDir()) return false; - if (hasMoveDir()) { - if (!getMoveDir() - .equals(other.getMoveDir())) return false; - } if (hasRot() != other.hasRot()) return false; if (hasRot()) { if (!getRot() .equals(other.getRot())) return false; } + if (hasMoveDir() != other.hasMoveDir()) return false; + if (hasMoveDir()) { + if (!getMoveDir() + .equals(other.getMoveDir())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -350,14 +346,14 @@ public int hashCode() { hash = (37 * hash) + POS_FIELD_NUMBER; hash = (53 * hash) + getPos().hashCode(); } - if (hasMoveDir()) { - hash = (37 * hash) + MOVE_DIR_FIELD_NUMBER; - hash = (53 * hash) + getMoveDir().hashCode(); - } if (hasRot()) { hash = (37 * hash) + ROT_FIELD_NUMBER; hash = (53 * hash) + getRot().hashCode(); } + if (hasMoveDir()) { + hash = (37 * hash) + MOVE_DIR_FIELD_NUMBER; + hash = (53 * hash) + getMoveDir().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -454,10 +450,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: AJIIAKCDDHA
-     *
- * * Protobuf type {@code AbilityBornType} */ public static final class Builder extends @@ -501,18 +493,18 @@ public Builder clear() { pos_ = null; posBuilder_ = null; } - if (moveDirBuilder_ == null) { - moveDir_ = null; - } else { - moveDir_ = null; - moveDirBuilder_ = null; - } if (rotBuilder_ == null) { rot_ = null; } else { rot_ = null; rotBuilder_ = null; } + if (moveDirBuilder_ == null) { + moveDir_ = null; + } else { + moveDir_ = null; + moveDirBuilder_ = null; + } return this; } @@ -544,16 +536,16 @@ public emu.grasscutter.net.proto.AbilityBornTypeOuterClass.AbilityBornType build } else { result.pos_ = posBuilder_.build(); } - if (moveDirBuilder_ == null) { - result.moveDir_ = moveDir_; - } else { - result.moveDir_ = moveDirBuilder_.build(); - } if (rotBuilder_ == null) { result.rot_ = rot_; } else { result.rot_ = rotBuilder_.build(); } + if (moveDirBuilder_ == null) { + result.moveDir_ = moveDir_; + } else { + result.moveDir_ = moveDirBuilder_.build(); + } onBuilt(); return result; } @@ -605,12 +597,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AbilityBornTypeOuterClass.Abi if (other.hasPos()) { mergePos(other.getPos()); } - if (other.hasMoveDir()) { - mergeMoveDir(other.getMoveDir()); - } if (other.hasRot()) { mergeRot(other.getRot()); } + if (other.hasMoveDir()) { + mergeMoveDir(other.getMoveDir()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -644,14 +636,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; /** - * .Vector pos = 3; + * .Vector pos = 8; * @return Whether the pos field is set. */ public boolean hasPos() { return posBuilder_ != null || pos_ != null; } /** - * .Vector pos = 3; + * .Vector pos = 8; * @return The pos. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { @@ -662,7 +654,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { } } /** - * .Vector pos = 3; + * .Vector pos = 8; */ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (posBuilder_ == null) { @@ -678,7 +670,7 @@ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { return this; } /** - * .Vector pos = 3; + * .Vector pos = 8; */ public Builder setPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -692,7 +684,7 @@ public Builder setPos( return this; } /** - * .Vector pos = 3; + * .Vector pos = 8; */ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (posBuilder_ == null) { @@ -710,7 +702,7 @@ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) return this; } /** - * .Vector pos = 3; + * .Vector pos = 8; */ public Builder clearPos() { if (posBuilder_ == null) { @@ -724,7 +716,7 @@ public Builder clearPos() { return this; } /** - * .Vector pos = 3; + * .Vector pos = 8; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { @@ -732,7 +724,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() return getPosFieldBuilder().getBuilder(); } /** - * .Vector pos = 3; + * .Vector pos = 8; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { if (posBuilder_ != null) { @@ -743,7 +735,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde } } /** - * .Vector pos = 3; + * .Vector pos = 8; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -759,242 +751,242 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde return posBuilder_; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; + private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> moveDirBuilder_; + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; /** - * .Vector move_dir = 4; - * @return Whether the moveDir field is set. + * .Vector rot = 12; + * @return Whether the rot field is set. */ - public boolean hasMoveDir() { - return moveDirBuilder_ != null || moveDir_ != null; + public boolean hasRot() { + return rotBuilder_ != null || rot_ != null; } /** - * .Vector move_dir = 4; - * @return The moveDir. + * .Vector rot = 12; + * @return The rot. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { - if (moveDirBuilder_ == null) { - return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { + if (rotBuilder_ == null) { + return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } else { - return moveDirBuilder_.getMessage(); + return rotBuilder_.getMessage(); } } /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ - public Builder setMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (moveDirBuilder_ == null) { + public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (rotBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - moveDir_ = value; + rot_ = value; onChanged(); } else { - moveDirBuilder_.setMessage(value); + rotBuilder_.setMessage(value); } return this; } /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ - public Builder setMoveDir( + public Builder setRot( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (moveDirBuilder_ == null) { - moveDir_ = builderForValue.build(); + if (rotBuilder_ == null) { + rot_ = builderForValue.build(); onChanged(); } else { - moveDirBuilder_.setMessage(builderForValue.build()); + rotBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ - public Builder mergeMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (moveDirBuilder_ == null) { - if (moveDir_ != null) { - moveDir_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(moveDir_).mergeFrom(value).buildPartial(); + public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (rotBuilder_ == null) { + if (rot_ != null) { + rot_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial(); } else { - moveDir_ = value; + rot_ = value; } onChanged(); } else { - moveDirBuilder_.mergeFrom(value); + rotBuilder_.mergeFrom(value); } return this; } /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ - public Builder clearMoveDir() { - if (moveDirBuilder_ == null) { - moveDir_ = null; + public Builder clearRot() { + if (rotBuilder_ == null) { + rot_ = null; onChanged(); } else { - moveDir_ = null; - moveDirBuilder_ = null; + rot_ = null; + rotBuilder_ = null; } return this; } /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMoveDirBuilder() { + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { onChanged(); - return getMoveDirFieldBuilder().getBuilder(); + return getRotFieldBuilder().getBuilder(); } /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { - if (moveDirBuilder_ != null) { - return moveDirBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { + if (rotBuilder_ != null) { + return rotBuilder_.getMessageOrBuilder(); } else { - return moveDir_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + return rot_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } } /** - * .Vector move_dir = 4; + * .Vector rot = 12; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getMoveDirFieldBuilder() { - if (moveDirBuilder_ == null) { - moveDirBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getRotFieldBuilder() { + if (rotBuilder_ == null) { + rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getMoveDir(), + getRot(), getParentForChildren(), isClean()); - moveDir_ = null; + rot_ = null; } - return moveDirBuilder_; + return rotBuilder_; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; + private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> moveDirBuilder_; /** - * .Vector rot = 11; - * @return Whether the rot field is set. + * .Vector move_dir = 15; + * @return Whether the moveDir field is set. */ - public boolean hasRot() { - return rotBuilder_ != null || rot_ != null; + public boolean hasMoveDir() { + return moveDirBuilder_ != null || moveDir_ != null; } /** - * .Vector rot = 11; - * @return The rot. + * .Vector move_dir = 15; + * @return The moveDir. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { - if (rotBuilder_ == null) { - return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { + if (moveDirBuilder_ == null) { + return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; } else { - return rotBuilder_.getMessage(); + return moveDirBuilder_.getMessage(); } } /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ - public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (rotBuilder_ == null) { + public Builder setMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (moveDirBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - rot_ = value; + moveDir_ = value; onChanged(); } else { - rotBuilder_.setMessage(value); + moveDirBuilder_.setMessage(value); } return this; } /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ - public Builder setRot( + public Builder setMoveDir( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (rotBuilder_ == null) { - rot_ = builderForValue.build(); + if (moveDirBuilder_ == null) { + moveDir_ = builderForValue.build(); onChanged(); } else { - rotBuilder_.setMessage(builderForValue.build()); + moveDirBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ - public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (rotBuilder_ == null) { - if (rot_ != null) { - rot_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial(); + public Builder mergeMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (moveDirBuilder_ == null) { + if (moveDir_ != null) { + moveDir_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(moveDir_).mergeFrom(value).buildPartial(); } else { - rot_ = value; + moveDir_ = value; } onChanged(); } else { - rotBuilder_.mergeFrom(value); + moveDirBuilder_.mergeFrom(value); } return this; } /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ - public Builder clearRot() { - if (rotBuilder_ == null) { - rot_ = null; + public Builder clearMoveDir() { + if (moveDirBuilder_ == null) { + moveDir_ = null; onChanged(); } else { - rot_ = null; - rotBuilder_ = null; + moveDir_ = null; + moveDirBuilder_ = null; } return this; } /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMoveDirBuilder() { onChanged(); - return getRotFieldBuilder().getBuilder(); + return getMoveDirFieldBuilder().getBuilder(); } /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { - if (rotBuilder_ != null) { - return rotBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { + if (moveDirBuilder_ != null) { + return moveDirBuilder_.getMessageOrBuilder(); } else { - return rot_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + return moveDir_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; } } /** - * .Vector rot = 11; + * .Vector move_dir = 15; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getRotFieldBuilder() { - if (rotBuilder_ == null) { - rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getMoveDirFieldBuilder() { + if (moveDirBuilder_ == null) { + moveDirBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getRot(), + getMoveDir(), getParentForChildren(), isClean()); - rot_ = null; + moveDir_ = null; } - return rotBuilder_; + return moveDirBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -1064,8 +1056,8 @@ public emu.grasscutter.net.proto.AbilityBornTypeOuterClass.AbilityBornType getDe static { java.lang.String[] descriptorData = { "\n\025AbilityBornType.proto\032\014Vector.proto\"X\n" + - "\017AbilityBornType\022\024\n\003pos\030\003 \001(\0132\007.Vector\022\031" + - "\n\010move_dir\030\004 \001(\0132\007.Vector\022\024\n\003rot\030\013 \001(\0132\007" + + "\017AbilityBornType\022\024\n\003pos\030\010 \001(\0132\007.Vector\022\024" + + "\n\003rot\030\014 \001(\0132\007.Vector\022\031\n\010move_dir\030\017 \001(\0132\007" + ".VectorB\033\n\031emu.grasscutter.net.protob\006pr" + "oto3" }; @@ -1079,7 +1071,7 @@ public emu.grasscutter.net.proto.AbilityBornTypeOuterClass.AbilityBornType getDe internal_static_AbilityBornType_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AbilityBornType_descriptor, - new java.lang.String[] { "Pos", "MoveDir", "Rot", }); + new java.lang.String[] { "Pos", "Rot", "MoveDir", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java index b11642ed5aa..fcfbde54bbf 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java @@ -40,6 +40,11 @@ public interface AbilityChangeNotifyOrBuilder extends emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder(); } /** + * 
+   * CmdId: 21684
+   * obf: DGBGDLDJIAF
+   *
+ * * Protobuf type {@code AbilityChangeNotify} */ public static final class AbilityChangeNotify extends @@ -343,6 +348,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 21684
+     * obf: DGBGDLDJIAF
+     *
+ * * Protobuf type {@code AbilityChangeNotify} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java index c08ce8a101e..3c69e0703a4 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityFireworkBornTypeOuterClass.java @@ -19,61 +19,57 @@ public interface AbilityFireworkBornTypeOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 effect_index = 14; - * @return The effectIndex. - */ - int getEffectIndex(); - - /** - * .Vector rot = 5; - * @return Whether the rot field is set. + * .Vector move_dir = 10; + * @return Whether the moveDir field is set. */ - boolean hasRot(); + boolean hasMoveDir(); /** - * .Vector rot = 5; - * @return The rot. + * .Vector move_dir = 10; + * @return The moveDir. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir(); /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder(); /** - * .Vector pos = 12; + * .Vector pos = 11; * @return Whether the pos field is set. */ boolean hasPos(); /** - * .Vector pos = 12; + * .Vector pos = 11; * @return The pos. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); /** - * .Vector pos = 12; + * .Vector pos = 11; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); /** - * .Vector move_dir = 15; - * @return Whether the moveDir field is set. + * uint32 effect_index = 13; + * @return The effectIndex. */ - boolean hasMoveDir(); + int getEffectIndex(); + /** - * .Vector move_dir = 15; - * @return The moveDir. + * .Vector rot = 14; + * @return Whether the rot field is set. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir(); + boolean hasRot(); /** - * .Vector move_dir = 15; + * .Vector rot = 14; + * @return The rot. */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder(); + emu.grasscutter.net.proto.VectorOuterClass.Vector getRot(); + /** + * .Vector rot = 14; + */ + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder(); } /** - * 
-   * Obf: KNMNMIBIHEK
-   *
- * * Protobuf type {@code AbilityFireworkBornType} */ public static final class AbilityFireworkBornType extends @@ -118,20 +114,20 @@ private AbilityFireworkBornType( case 0: done = true; break; - case 42: { + case 82: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (rot_ != null) { - subBuilder = rot_.toBuilder(); + if (moveDir_ != null) { + subBuilder = moveDir_.toBuilder(); } - rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + moveDir_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(rot_); - rot_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(moveDir_); + moveDir_ = subBuilder.buildPartial(); } break; } - case 98: { + case 90: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (pos_ != null) { subBuilder = pos_.toBuilder(); @@ -144,20 +140,20 @@ private AbilityFireworkBornType( break; } - case 112: { + case 104: { effectIndex_ = input.readUInt32(); break; } - case 122: { + case 114: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (moveDir_ != null) { - subBuilder = moveDir_.toBuilder(); + if (rot_ != null) { + subBuilder = rot_.toBuilder(); } - moveDir_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(moveDir_); - moveDir_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(rot_); + rot_ = subBuilder.buildPartial(); } break; @@ -194,47 +190,36 @@ private AbilityFireworkBornType( emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.class, emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.Builder.class); } - public static final int EFFECT_INDEX_FIELD_NUMBER = 14; - private int effectIndex_; - /** - * uint32 effect_index = 14; - * @return The effectIndex. - */ - @java.lang.Override - public int getEffectIndex() { - return effectIndex_; - } - - public static final int ROT_FIELD_NUMBER = 5; - private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; + public static final int MOVE_DIR_FIELD_NUMBER = 10; + private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; /** - * .Vector rot = 5; - * @return Whether the rot field is set. + * .Vector move_dir = 10; + * @return Whether the moveDir field is set. */ @java.lang.Override - public boolean hasRot() { - return rot_ != null; + public boolean hasMoveDir() { + return moveDir_ != null; } /** - * .Vector rot = 5; - * @return The rot. + * .Vector move_dir = 10; + * @return The moveDir. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { - return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { + return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; } /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { - return getRot(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { + return getMoveDir(); } - public static final int POS_FIELD_NUMBER = 12; + public static final int POS_FIELD_NUMBER = 11; private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; /** - * .Vector pos = 12; + * .Vector pos = 11; * @return Whether the pos field is set. */ @java.lang.Override @@ -242,7 +227,7 @@ public boolean hasPos() { return pos_ != null; } /** - * .Vector pos = 12; + * .Vector pos = 11; * @return The pos. */ @java.lang.Override @@ -250,37 +235,48 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; } /** - * .Vector pos = 12; + * .Vector pos = 11; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { return getPos(); } - public static final int MOVE_DIR_FIELD_NUMBER = 15; - private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; + public static final int EFFECT_INDEX_FIELD_NUMBER = 13; + private int effectIndex_; /** - * .Vector move_dir = 15; - * @return Whether the moveDir field is set. + * uint32 effect_index = 13; + * @return The effectIndex. */ @java.lang.Override - public boolean hasMoveDir() { - return moveDir_ != null; + public int getEffectIndex() { + return effectIndex_; } + + public static final int ROT_FIELD_NUMBER = 14; + private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; /** - * .Vector move_dir = 15; - * @return The moveDir. + * .Vector rot = 14; + * @return Whether the rot field is set. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { - return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + public boolean hasRot() { + return rot_ != null; } /** - * .Vector move_dir = 15; + * .Vector rot = 14; + * @return The rot. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { - return getMoveDir(); + public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { + return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + } + /** + * .Vector rot = 14; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { + return getRot(); } private byte memoizedIsInitialized = -1; @@ -297,17 +293,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (rot_ != null) { - output.writeMessage(5, getRot()); + if (moveDir_ != null) { + output.writeMessage(10, getMoveDir()); } if (pos_ != null) { - output.writeMessage(12, getPos()); + output.writeMessage(11, getPos()); } if (effectIndex_ != 0) { - output.writeUInt32(14, effectIndex_); + output.writeUInt32(13, effectIndex_); } - if (moveDir_ != null) { - output.writeMessage(15, getMoveDir()); + if (rot_ != null) { + output.writeMessage(14, getRot()); } unknownFields.writeTo(output); } @@ -318,21 +314,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (rot_ != null) { + if (moveDir_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getRot()); + .computeMessageSize(10, getMoveDir()); } if (pos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, getPos()); + .computeMessageSize(11, getPos()); } if (effectIndex_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, effectIndex_); + .computeUInt32Size(13, effectIndex_); } - if (moveDir_ != null) { + if (rot_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, getMoveDir()); + .computeMessageSize(14, getRot()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -349,22 +345,22 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType other = (emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType) obj; - if (getEffectIndex() - != other.getEffectIndex()) return false; - if (hasRot() != other.hasRot()) return false; - if (hasRot()) { - if (!getRot() - .equals(other.getRot())) return false; + if (hasMoveDir() != other.hasMoveDir()) return false; + if (hasMoveDir()) { + if (!getMoveDir() + .equals(other.getMoveDir())) return false; } if (hasPos() != other.hasPos()) return false; if (hasPos()) { if (!getPos() .equals(other.getPos())) return false; } - if (hasMoveDir() != other.hasMoveDir()) return false; - if (hasMoveDir()) { - if (!getMoveDir() - .equals(other.getMoveDir())) return false; + if (getEffectIndex() + != other.getEffectIndex()) return false; + if (hasRot() != other.hasRot()) return false; + if (hasRot()) { + if (!getRot() + .equals(other.getRot())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -377,19 +373,19 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + EFFECT_INDEX_FIELD_NUMBER; - hash = (53 * hash) + getEffectIndex(); - if (hasRot()) { - hash = (37 * hash) + ROT_FIELD_NUMBER; - hash = (53 * hash) + getRot().hashCode(); + if (hasMoveDir()) { + hash = (37 * hash) + MOVE_DIR_FIELD_NUMBER; + hash = (53 * hash) + getMoveDir().hashCode(); } if (hasPos()) { hash = (37 * hash) + POS_FIELD_NUMBER; hash = (53 * hash) + getPos().hashCode(); } - if (hasMoveDir()) { - hash = (37 * hash) + MOVE_DIR_FIELD_NUMBER; - hash = (53 * hash) + getMoveDir().hashCode(); + hash = (37 * hash) + EFFECT_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getEffectIndex(); + if (hasRot()) { + hash = (37 * hash) + ROT_FIELD_NUMBER; + hash = (53 * hash) + getRot().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -487,10 +483,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: KNMNMIBIHEK
-     *
- * * Protobuf type {@code AbilityFireworkBornType} */ public static final class Builder extends @@ -528,13 +520,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - effectIndex_ = 0; - - if (rotBuilder_ == null) { - rot_ = null; + if (moveDirBuilder_ == null) { + moveDir_ = null; } else { - rot_ = null; - rotBuilder_ = null; + moveDir_ = null; + moveDirBuilder_ = null; } if (posBuilder_ == null) { pos_ = null; @@ -542,11 +532,13 @@ public Builder clear() { pos_ = null; posBuilder_ = null; } - if (moveDirBuilder_ == null) { - moveDir_ = null; + effectIndex_ = 0; + + if (rotBuilder_ == null) { + rot_ = null; } else { - moveDir_ = null; - moveDirBuilder_ = null; + rot_ = null; + rotBuilder_ = null; } return this; } @@ -574,21 +566,21 @@ public emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFirewo @java.lang.Override public emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType buildPartial() { emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType result = new emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType(this); - result.effectIndex_ = effectIndex_; - if (rotBuilder_ == null) { - result.rot_ = rot_; + if (moveDirBuilder_ == null) { + result.moveDir_ = moveDir_; } else { - result.rot_ = rotBuilder_.build(); + result.moveDir_ = moveDirBuilder_.build(); } if (posBuilder_ == null) { result.pos_ = pos_; } else { result.pos_ = posBuilder_.build(); } - if (moveDirBuilder_ == null) { - result.moveDir_ = moveDir_; + result.effectIndex_ = effectIndex_; + if (rotBuilder_ == null) { + result.rot_ = rot_; } else { - result.moveDir_ = moveDirBuilder_.build(); + result.rot_ = rotBuilder_.build(); } onBuilt(); return result; @@ -638,18 +630,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType other) { if (other == emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFireworkBornType.getDefaultInstance()) return this; + if (other.hasMoveDir()) { + mergeMoveDir(other.getMoveDir()); + } + if (other.hasPos()) { + mergePos(other.getPos()); + } if (other.getEffectIndex() != 0) { setEffectIndex(other.getEffectIndex()); } if (other.hasRot()) { mergeRot(other.getRot()); } - if (other.hasPos()) { - mergePos(other.getPos()); - } - if (other.hasMoveDir()) { - mergeMoveDir(other.getMoveDir()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -679,168 +671,137 @@ public Builder mergeFrom( return this; } - private int effectIndex_ ; - /** - * uint32 effect_index = 14; - * @return The effectIndex. - */ - @java.lang.Override - public int getEffectIndex() { - return effectIndex_; - } - /** - * uint32 effect_index = 14; - * @param value The effectIndex to set. - * @return This builder for chaining. - */ - public Builder setEffectIndex(int value) { - - effectIndex_ = value; - onChanged(); - return this; - } - /** - * uint32 effect_index = 14; - * @return This builder for chaining. - */ - public Builder clearEffectIndex() { - - effectIndex_ = 0; - onChanged(); - return this; - } - - private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; + private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> moveDirBuilder_; /** - * .Vector rot = 5; - * @return Whether the rot field is set. + * .Vector move_dir = 10; + * @return Whether the moveDir field is set. */ - public boolean hasRot() { - return rotBuilder_ != null || rot_ != null; + public boolean hasMoveDir() { + return moveDirBuilder_ != null || moveDir_ != null; } /** - * .Vector rot = 5; - * @return The rot. + * .Vector move_dir = 10; + * @return The moveDir. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { - if (rotBuilder_ == null) { - return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { + if (moveDirBuilder_ == null) { + return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; } else { - return rotBuilder_.getMessage(); + return moveDirBuilder_.getMessage(); } } /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ - public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (rotBuilder_ == null) { + public Builder setMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (moveDirBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - rot_ = value; + moveDir_ = value; onChanged(); } else { - rotBuilder_.setMessage(value); + moveDirBuilder_.setMessage(value); } return this; } /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ - public Builder setRot( + public Builder setMoveDir( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (rotBuilder_ == null) { - rot_ = builderForValue.build(); + if (moveDirBuilder_ == null) { + moveDir_ = builderForValue.build(); onChanged(); } else { - rotBuilder_.setMessage(builderForValue.build()); + moveDirBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ - public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (rotBuilder_ == null) { - if (rot_ != null) { - rot_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial(); + public Builder mergeMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (moveDirBuilder_ == null) { + if (moveDir_ != null) { + moveDir_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(moveDir_).mergeFrom(value).buildPartial(); } else { - rot_ = value; + moveDir_ = value; } onChanged(); } else { - rotBuilder_.mergeFrom(value); + moveDirBuilder_.mergeFrom(value); } return this; } /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ - public Builder clearRot() { - if (rotBuilder_ == null) { - rot_ = null; + public Builder clearMoveDir() { + if (moveDirBuilder_ == null) { + moveDir_ = null; onChanged(); } else { - rot_ = null; - rotBuilder_ = null; + moveDir_ = null; + moveDirBuilder_ = null; } return this; } /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMoveDirBuilder() { onChanged(); - return getRotFieldBuilder().getBuilder(); + return getMoveDirFieldBuilder().getBuilder(); } /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { - if (rotBuilder_ != null) { - return rotBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { + if (moveDirBuilder_ != null) { + return moveDirBuilder_.getMessageOrBuilder(); } else { - return rot_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; + return moveDir_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; } } /** - * .Vector rot = 5; + * .Vector move_dir = 10; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getRotFieldBuilder() { - if (rotBuilder_ == null) { - rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getMoveDirFieldBuilder() { + if (moveDirBuilder_ == null) { + moveDirBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getRot(), + getMoveDir(), getParentForChildren(), isClean()); - rot_ = null; + moveDir_ = null; } - return rotBuilder_; + return moveDirBuilder_; } private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; /** - * .Vector pos = 12; + * .Vector pos = 11; * @return Whether the pos field is set. */ public boolean hasPos() { return posBuilder_ != null || pos_ != null; } /** - * .Vector pos = 12; + * .Vector pos = 11; * @return The pos. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { @@ -851,7 +812,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { } } /** - * .Vector pos = 12; + * .Vector pos = 11; */ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (posBuilder_ == null) { @@ -867,7 +828,7 @@ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { return this; } /** - * .Vector pos = 12; + * .Vector pos = 11; */ public Builder setPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -881,7 +842,7 @@ public Builder setPos( return this; } /** - * .Vector pos = 12; + * .Vector pos = 11; */ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (posBuilder_ == null) { @@ -899,7 +860,7 @@ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) return this; } /** - * .Vector pos = 12; + * .Vector pos = 11; */ public Builder clearPos() { if (posBuilder_ == null) { @@ -913,7 +874,7 @@ public Builder clearPos() { return this; } /** - * .Vector pos = 12; + * .Vector pos = 11; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { @@ -921,7 +882,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() return getPosFieldBuilder().getBuilder(); } /** - * .Vector pos = 12; + * .Vector pos = 11; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { if (posBuilder_ != null) { @@ -932,7 +893,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde } } /** - * .Vector pos = 12; + * .Vector pos = 11; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -948,123 +909,154 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde return posBuilder_; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector moveDir_; + private int effectIndex_ ; + /** + * uint32 effect_index = 13; + * @return The effectIndex. + */ + @java.lang.Override + public int getEffectIndex() { + return effectIndex_; + } + /** + * uint32 effect_index = 13; + * @param value The effectIndex to set. + * @return This builder for chaining. + */ + public Builder setEffectIndex(int value) { + + effectIndex_ = value; + onChanged(); + return this; + } + /** + * uint32 effect_index = 13; + * @return This builder for chaining. + */ + public Builder clearEffectIndex() { + + effectIndex_ = 0; + onChanged(); + return this; + } + + private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> moveDirBuilder_; + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_; /** - * .Vector move_dir = 15; - * @return Whether the moveDir field is set. + * .Vector rot = 14; + * @return Whether the rot field is set. */ - public boolean hasMoveDir() { - return moveDirBuilder_ != null || moveDir_ != null; + public boolean hasRot() { + return rotBuilder_ != null || rot_ != null; } /** - * .Vector move_dir = 15; - * @return The moveDir. + * .Vector rot = 14; + * @return The rot. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getMoveDir() { - if (moveDirBuilder_ == null) { - return moveDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() { + if (rotBuilder_ == null) { + return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } else { - return moveDirBuilder_.getMessage(); + return rotBuilder_.getMessage(); } } /** - * .Vector move_dir = 15; + * .Vector rot = 14; */ - public Builder setMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (moveDirBuilder_ == null) { + public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (rotBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - moveDir_ = value; + rot_ = value; onChanged(); } else { - moveDirBuilder_.setMessage(value); + rotBuilder_.setMessage(value); } return this; } /** - * .Vector move_dir = 15; + * .Vector rot = 14; */ - public Builder setMoveDir( + public Builder setRot( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (moveDirBuilder_ == null) { - moveDir_ = builderForValue.build(); + if (rotBuilder_ == null) { + rot_ = builderForValue.build(); onChanged(); } else { - moveDirBuilder_.setMessage(builderForValue.build()); + rotBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .Vector move_dir = 15; + * .Vector rot = 14; */ - public Builder mergeMoveDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (moveDirBuilder_ == null) { - if (moveDir_ != null) { - moveDir_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(moveDir_).mergeFrom(value).buildPartial(); + public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (rotBuilder_ == null) { + if (rot_ != null) { + rot_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(rot_).mergeFrom(value).buildPartial(); } else { - moveDir_ = value; + rot_ = value; } onChanged(); } else { - moveDirBuilder_.mergeFrom(value); + rotBuilder_.mergeFrom(value); } return this; } /** - * .Vector move_dir = 15; + * .Vector rot = 14; */ - public Builder clearMoveDir() { - if (moveDirBuilder_ == null) { - moveDir_ = null; + public Builder clearRot() { + if (rotBuilder_ == null) { + rot_ = null; onChanged(); } else { - moveDir_ = null; - moveDirBuilder_ = null; + rot_ = null; + rotBuilder_ = null; } return this; } /** - * .Vector move_dir = 15; + * .Vector rot = 14; */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMoveDirBuilder() { + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() { onChanged(); - return getMoveDirFieldBuilder().getBuilder(); + return getRotFieldBuilder().getBuilder(); } /** - * .Vector move_dir = 15; + * .Vector rot = 14; */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMoveDirOrBuilder() { - if (moveDirBuilder_ != null) { - return moveDirBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() { + if (rotBuilder_ != null) { + return rotBuilder_.getMessageOrBuilder(); } else { - return moveDir_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : moveDir_; + return rot_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_; } } /** - * .Vector move_dir = 15; + * .Vector rot = 14; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getMoveDirFieldBuilder() { - if (moveDirBuilder_ == null) { - moveDirBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getRotFieldBuilder() { + if (rotBuilder_ == null) { + rotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getMoveDir(), + getRot(), getParentForChildren(), isClean()); - moveDir_ = null; + rot_ = null; } - return moveDirBuilder_; + return rotBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -1134,9 +1126,9 @@ public emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFirewo static { java.lang.String[] descriptorData = { "\n\035AbilityFireworkBornType.proto\032\014Vector." + - "proto\"v\n\027AbilityFireworkBornType\022\024\n\014effe" + - "ct_index\030\016 \001(\r\022\024\n\003rot\030\005 \001(\0132\007.Vector\022\024\n\003" + - "pos\030\014 \001(\0132\007.Vector\022\031\n\010move_dir\030\017 \001(\0132\007.V" + + "proto\"v\n\027AbilityFireworkBornType\022\031\n\010move" + + "_dir\030\n \001(\0132\007.Vector\022\024\n\003pos\030\013 \001(\0132\007.Vecto" + + "r\022\024\n\014effect_index\030\r \001(\r\022\024\n\003rot\030\016 \001(\0132\007.V" + "ectorB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; @@ -1150,7 +1142,7 @@ public emu.grasscutter.net.proto.AbilityFireworkBornTypeOuterClass.AbilityFirewo internal_static_AbilityFireworkBornType_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AbilityFireworkBornType_descriptor, - new java.lang.String[] { "EffectIndex", "Rot", "Pos", "MoveDir", }); + new java.lang.String[] { "MoveDir", "Pos", "EffectIndex", "Rot", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java index 73fbb89aa6a..b42f63d28d9 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java @@ -54,6 +54,7 @@ public interface AbilityInvocationFailNotifyOrBuilder extends /** * 
    * CmdId: 9225
+   * obf: MLNOHFGMIAK
    *
* * Protobuf type {@code AbilityInvocationFailNotify} @@ -416,6 +417,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 9225
+     * obf: MLNOHFGMIAK
      *
* * Protobuf type {@code AbilityInvocationFailNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java index a7f48175a57..c4497f5a233 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java @@ -20,648 +20,680 @@ public static void registerAllExtensions( public enum AbilityInvokeArgument implements com.google.protobuf.ProtocolMessageEnum { /** - * ABILITY_INVOKE_ARGUMENT_NONE = 0; + * ABILITY_NONE = 0; */ - ABILITY_INVOKE_ARGUMENT_NONE(0), + ABILITY_NONE(0), /** - * ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1; + * ABILITY_META_MODIFIER_CHANGE = 1; */ - ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE(1), + ABILITY_META_MODIFIER_CHANGE(1), /** - * ABILITY_INVOKE_ARGUMENT_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2; + * ABILITY_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2; */ - ABILITY_INVOKE_ARGUMENT_META_COMMAND_MODIFIER_CHANGE_REQUEST(2), + ABILITY_META_COMMAND_MODIFIER_CHANGE_REQUEST(2), /** - * ABILITY_INVOKE_ARGUMENT_META_SPECIAL_FLOAT_ARGUMENT = 3; + * ABILITY_META_SPECIAL_FLOAT_ARGUMENT = 3; */ - ABILITY_INVOKE_ARGUMENT_META_SPECIAL_FLOAT_ARGUMENT(3), + ABILITY_META_SPECIAL_FLOAT_ARGUMENT(3), /** - * ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM = 4; + * ABILITY_META_OVERRIDE_PARAM = 4; */ - ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM(4), + ABILITY_META_OVERRIDE_PARAM(4), /** - * ABILITY_INVOKE_ARGUMENT_META_CLEAR_OVERRIDE_PARAM = 5; + * ABILITY_META_CLEAR_OVERRIDE_PARAM = 5; */ - ABILITY_INVOKE_ARGUMENT_META_CLEAR_OVERRIDE_PARAM(5), + ABILITY_META_CLEAR_OVERRIDE_PARAM(5), /** - * ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP = 6; + * ABILITY_META_REINIT_OVERRIDEMAP = 6; */ - ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP(6), + ABILITY_META_REINIT_OVERRIDEMAP(6), /** - * ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE = 7; + * ABILITY_META_GLOBAL_FLOAT_VALUE = 7; */ - ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE(7), + ABILITY_META_GLOBAL_FLOAT_VALUE(7), /** - * ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE = 8; + * ABILITY_META_CLEAR_GLOBAL_FLOAT_VALUE = 8; */ - ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE(8), + ABILITY_META_CLEAR_GLOBAL_FLOAT_VALUE(8), /** - * ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH = 9; + * ABILITY_META_ABILITY_ELEMENT_STRENGTH = 9; */ - ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH(9), + ABILITY_META_ABILITY_ELEMENT_STRENGTH(9), /** - * ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10; + * ABILITY_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10; */ - ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER(10), + ABILITY_META_ADD_OR_GET_ABILITY_AND_TRIGGER(10), /** - * ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE = 11; + * ABILITY_META_SET_KILLED_SETATE = 11; */ - ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE(11), + ABILITY_META_SET_KILLED_SETATE(11), /** - * ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER = 12; + * ABILITY_META_SET_ABILITY_TRIGGER = 12; */ - ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER(12), + ABILITY_META_SET_ABILITY_TRIGGER(12), /** - * ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY = 13; + * ABILITY_META_ADD_NEW_ABILITY = 13; */ - ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY(13), + ABILITY_META_ADD_NEW_ABILITY(13), /** - * ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY = 14; + * ABILITY_META_REMOVE_ABILITY = 14; */ - ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY(14), + ABILITY_META_REMOVE_ABILITY(14), /** - * ABILITY_INVOKE_ARGUMENT_META_SET_MODIFIER_APPLY_ENTITY = 15; + * ABILITY_META_SET_MODIFIER_APPLY_ENTITY = 15; */ - ABILITY_INVOKE_ARGUMENT_META_SET_MODIFIER_APPLY_ENTITY(15), + ABILITY_META_SET_MODIFIER_APPLY_ENTITY(15), /** - * ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE = 16; + * ABILITY_META_MODIFIER_DURABILITY_CHANGE = 16; */ - ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE(16), + ABILITY_META_MODIFIER_DURABILITY_CHANGE(16), /** - * ABILITY_INVOKE_ARGUMENT_META_ELEMENT_REACTION_VISUAL = 17; + * ABILITY_META_ELEMENT_REACTION_VISUAL = 17; */ - ABILITY_INVOKE_ARGUMENT_META_ELEMENT_REACTION_VISUAL(17), + ABILITY_META_ELEMENT_REACTION_VISUAL(17), /** - * ABILITY_INVOKE_ARGUMENT_META_SET_POSE_PARAMETER = 18; + * ABILITY_META_SET_POSE_PARAMETER = 18; */ - ABILITY_INVOKE_ARGUMENT_META_SET_POSE_PARAMETER(18), + ABILITY_META_SET_POSE_PARAMETER(18), /** - * ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE = 19; + * ABILITY_META_UPDATE_BASE_REACTION_DAMAGE = 19; */ - ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE(19), + ABILITY_META_UPDATE_BASE_REACTION_DAMAGE(19), /** - * ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION = 20; + * ABILITY_META_TRIGGER_ELEMENT_REACTION = 20; */ - ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION(20), + ABILITY_META_TRIGGER_ELEMENT_REACTION(20), /** - * ABILITY_INVOKE_ARGUMENT_META_LOSE_HP = 21; + * ABILITY_META_LOSE_HP = 21; */ - ABILITY_INVOKE_ARGUMENT_META_LOSE_HP(21), + ABILITY_META_LOSE_HP(21), /** - * ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO = 22; + * ABILITY_META_DURABILITY_IS_ZERO = 22; */ - ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO(22), + ABILITY_META_DURABILITY_IS_ZERO(22), /** - * ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ARKHE_REACTION = 23; + * ABILITY_META_TRIGGER_ARKHE_REACTION = 23; */ - ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ARKHE_REACTION(23), + ABILITY_META_TRIGGER_ARKHE_REACTION(23), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50; + * ABILITY_META_CHANGE_NYX_VALUE = 24; */ - ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY(50), + ABILITY_META_CHANGE_NYX_VALUE(24), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE = 51; + * ABILITY_ACTION_TRIGGER_ABILITY = 50; */ - ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE(51), + ABILITY_ACTION_TRIGGER_ABILITY(50), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT = 52; + * ABILITY_ACTION_SET_CRASH_DAMAGE = 51; */ - ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT(52), + ABILITY_ACTION_SET_CRASH_DAMAGE(51), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON = 53; + * ABILITY_ACTION_EFFECT = 52; */ - ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON(53), + ABILITY_ACTION_EFFECT(52), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_BLINK = 54; + * ABILITY_ACTION_SUMMON = 53; */ - ABILITY_INVOKE_ARGUMENT_ACTION_BLINK(54), + ABILITY_ACTION_SUMMON(53), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET = 55; + * ABILITY_ACTION_BLINK = 54; */ - ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET(55), + ABILITY_ACTION_BLINK(54), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER = 56; + * ABILITY_ACTION_CREATE_GADGET = 55; */ - ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER(56), + ABILITY_ACTION_CREATE_GADGET(55), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL = 57; + * ABILITY_ACTION_APPLY_LEVEL_MODIFIER = 56; */ - ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL(57), + ABILITY_ACTION_APPLY_LEVEL_MODIFIER(56), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58; + * ABILITY_ACTION_GENERATE_ELEM_BALL = 57; */ - ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE(58), + ABILITY_ACTION_GENERATE_ELEM_BALL(57), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG = 59; + * ABILITY_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58; */ - ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG(59), + ABILITY_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE(58), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE = 60; + * ABILITY_ACTION_SERVER_MONSTER_LOG = 59; */ - ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE(60), + ABILITY_ACTION_SERVER_MONSTER_LOG(59), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE = 61; + * ABILITY_ACTION_CREATE_TILE = 60; */ - ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE(61), + ABILITY_ACTION_CREATE_TILE(60), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE = 62; + * ABILITY_ACTION_DESTROY_TILE = 61; */ - ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE(62), + ABILITY_ACTION_DESTROY_TILE(61), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA = 63; + * ABILITY_ACTION_FIRE_AFTER_IMAGE = 62; */ - ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA(63), + ABILITY_ACTION_FIRE_AFTER_IMAGE(62), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT = 64; + * ABILITY_ACTION_DEDUCT_STAMINA = 63; */ - ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT(64), + ABILITY_ACTION_DEDUCT_STAMINA(63), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET = 65; + * ABILITY_ACTION_HIT_EFFECT = 64; */ - ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET(65), + ABILITY_ACTION_HIT_EFFECT(64), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT = 66; + * ABILITY_ACTION_SET_BULLET_TRACK_TARGET = 65; */ - ABILITY_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT(66), + ABILITY_ACTION_SET_BULLET_TRACK_TARGET(65), /** - * ABILITY_INVOKE_ARGUMENT_ACTION_LEVEL_BANK_ADD_STUFF = 67; + * ABILITY_ACTION_FIREWORK_EFFECT = 66; */ - ABILITY_INVOKE_ARGUMENT_ACTION_LEVEL_BANK_ADD_STUFF(67), + ABILITY_ACTION_FIREWORK_EFFECT(66), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100; + * ABILITY_ACTION_LEVEL_BANK_ADD_STUFF = 67; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA(100), + ABILITY_ACTION_LEVEL_BANK_ADD_STUFF(67), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND = 101; + * ABILITY_ACTION_GET_MATERIAL_PARAM_FLOAT = 68; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND(101), + ABILITY_ACTION_GET_MATERIAL_PARAM_FLOAT(68), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE = 102; + * ABILITY_ACTION_GET_MATERIAL_PARAM_VECTOR = 69; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE(102), + ABILITY_ACTION_GET_MATERIAL_PARAM_VECTOR(69), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA = 103; + * ABILITY_ACTION_SPECTACLE_BUILD_RECREATE_GADGET = 70; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA(103), + ABILITY_ACTION_SPECTACLE_BUILD_RECREATE_GADGET(70), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHIELD = 104; + * ABILITY_MIXIN_AVATAR_STEER_BY_CAMERA = 100; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHIELD(104), + ABILITY_MIXIN_AVATAR_STEER_BY_CAMERA(100), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD = 105; + * ABILITY_MIXIN_MONSTER_DEFEND = 101; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD(105), + ABILITY_MIXIN_MONSTER_DEFEND(101), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SHIELD = 106; + * ABILITY_MIXIN_WIND_ZONE = 102; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SHIELD(106), + ABILITY_MIXIN_WIND_ZONE(102), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_SHIELD_BAR = 107; + * ABILITY_MIXIN_COST_STAMINA = 103; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_SHIELD_BAR(107), + ABILITY_MIXIN_COST_STAMINA(103), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNER = 108; + * ABILITY_MIXIN_ELITE_SHIELD = 104; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNER(108), + ABILITY_MIXIN_ELITE_SHIELD(104), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109; + * ABILITY_MIXIN_ELEMENT_SHIELD = 105; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_REACTION(109), + ABILITY_MIXIN_ELEMENT_SHIELD(105), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110; + * ABILITY_MIXIN_GLOBAL_SHIELD = 106; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE(110), + ABILITY_MIXIN_GLOBAL_SHIELD(106), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC = 111; + * ABILITY_MIXIN_SHIELD_BAR = 107; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC(111), + ABILITY_MIXIN_SHIELD_BAR(107), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT = 112; + * ABILITY_MIXIN_WIND_SEED_SPAWNER = 108; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT(112), + ABILITY_MIXIN_WIND_SEED_SPAWNER(108), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO = 113; + * ABILITY_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO(113), + ABILITY_MIXIN_DO_ACTION_BY_ELEMENT_REACTION(109), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER = 114; + * ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER(114), + ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE(110), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115; + * ABILITY_MIXIN_SCENE_PROP_SYNC = 111; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT(115), + ABILITY_MIXIN_SCENE_PROP_SYNC(111), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL = 116; + * ABILITY_MIXIN_WIDGET_MP_SUPPORT = 112; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL(116), + ABILITY_MIXIN_WIDGET_MP_SUPPORT(112), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT = 117; + * ABILITY_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO = 113; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT(117), + ABILITY_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO(113), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118; + * ABILITY_MIXIN_FIREWORKS_LAUNCHER = 114; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN(118), + ABILITY_MIXIN_FIREWORKS_LAUNCHER(114), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT = 119; + * ABILITY_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT(119), + ABILITY_MIXIN_ATTACK_RESULT_CREATE_COUNT(115), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA = 120; + * ABILITY_MIXIN_UGC_TIME_CONTROL = 116; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA(120), + ABILITY_MIXIN_UGC_TIME_CONTROL(116), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY = 121; + * ABILITY_MIXIN_AVATAR_COMBAT = 117; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY(121), + ABILITY_MIXIN_AVATAR_COMBAT(117), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT = 122; + * ABILITY_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT(122), + ABILITY_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN(118), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_DAMAGE_LOAN = 123; + * ABILITY_MIXIN_UI_INTERACT = 119; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_DAMAGE_LOAN(123), + ABILITY_MIXIN_UI_INTERACT(119), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_BROADCAST_GV = 124; + * ABILITY_MIXIN_SHOOT_FROM_CAMERA = 120; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_BROADCAST_GV(124), + ABILITY_MIXIN_SHOOT_FROM_CAMERA(120), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_RECEIVE_GV = 125; + * ABILITY_MIXIN_ERASE_BRICK_ACTIVITY = 121; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_RECEIVE_GV(125), + ABILITY_MIXIN_ERASE_BRICK_ACTIVITY(121), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_RAYCAST_SELECT_TARGET = 126; + * ABILITY_MIXIN_BREAKOUT = 122; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_RAYCAST_SELECT_TARGET(126), + ABILITY_MIXIN_BREAKOUT(122), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET = 127; + * ABILITY_MIXIN_DAMAGE_LOAN = 123; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET(127), + ABILITY_MIXIN_DAMAGE_LOAN(123), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128; + * ABILITY_MIXIN_BROADCAST_GV = 124; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA(128), + ABILITY_MIXIN_BROADCAST_GV(124), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129; + * ABILITY_MIXIN_RECEIVE_GV = 125; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE(129), + ABILITY_MIXIN_RECEIVE_GV(125), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130; + * ABILITY_MIXIN_RAYCAST_SELECT_TARGET = 126; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME(130), + ABILITY_MIXIN_RAYCAST_SELECT_TARGET(126), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131; + * ABILITY_MIXIN_ENERGY_CRYSTAL_TARGET = 127; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY(131), + ABILITY_MIXIN_ENERGY_CRYSTAL_TARGET(127), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133; + * ABILITY_MIXIN_ROTATION_FOLLOW_CAMERA = 128; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER(133), + ABILITY_MIXIN_ROTATION_FOLLOW_CAMERA(128), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW = 134; + * ABILITY_MIXIN_BUOYANT_FORCE = 129; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW(134), + ABILITY_MIXIN_BUOYANT_FORCE(129), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON = 135; + * ABILITY_MIXIN_FILMFEST_BALL_GAME = 130; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON(135), + ABILITY_MIXIN_FILMFEST_BALL_GAME(130), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136; + * ABILITY_MIXIN_CHECK_SCAN_ENTITY = 131; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL(136), + ABILITY_MIXIN_CHECK_SCAN_ENTITY(131), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR = 137; + * ABILITY_MIXIN_TIME_TRACK_PLAYER = 133; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR(137), + ABILITY_MIXIN_TIME_TRACK_PLAYER(133), /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA = 141; + * ABILITY_MIXIN_PART_FOLLOW = 134; */ - ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA(141), + ABILITY_MIXIN_PART_FOLLOW(134), + /** + * ABILITY_MIXIN_CHANGE_PHLOGISTON = 135; + */ + ABILITY_MIXIN_CHANGE_PHLOGISTON(135), + /** + * ABILITY_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136; + */ + ABILITY_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL(136), + /** + * ABILITY_MIXIN_FREQUENCY_SHIELD_BAR = 137; + */ + ABILITY_MIXIN_FREQUENCY_SHIELD_BAR(137), + /** + * ABILITY_MIXIN_VEHICLE_STEER_BY_CAMERA = 141; + */ + ABILITY_MIXIN_VEHICLE_STEER_BY_CAMERA(141), UNRECOGNIZED(-1), ; /** - * ABILITY_INVOKE_ARGUMENT_NONE = 0; + * ABILITY_NONE = 0; + */ + public static final int ABILITY_NONE_VALUE = 0; + /** + * ABILITY_META_MODIFIER_CHANGE = 1; + */ + public static final int ABILITY_META_MODIFIER_CHANGE_VALUE = 1; + /** + * ABILITY_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2; + */ + public static final int ABILITY_META_COMMAND_MODIFIER_CHANGE_REQUEST_VALUE = 2; + /** + * ABILITY_META_SPECIAL_FLOAT_ARGUMENT = 3; + */ + public static final int ABILITY_META_SPECIAL_FLOAT_ARGUMENT_VALUE = 3; + /** + * ABILITY_META_OVERRIDE_PARAM = 4; */ - public static final int ABILITY_INVOKE_ARGUMENT_NONE_VALUE = 0; + public static final int ABILITY_META_OVERRIDE_PARAM_VALUE = 4; /** - * ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1; + * ABILITY_META_CLEAR_OVERRIDE_PARAM = 5; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE_VALUE = 1; + public static final int ABILITY_META_CLEAR_OVERRIDE_PARAM_VALUE = 5; /** - * ABILITY_INVOKE_ARGUMENT_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2; + * ABILITY_META_REINIT_OVERRIDEMAP = 6; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_COMMAND_MODIFIER_CHANGE_REQUEST_VALUE = 2; + public static final int ABILITY_META_REINIT_OVERRIDEMAP_VALUE = 6; /** - * ABILITY_INVOKE_ARGUMENT_META_SPECIAL_FLOAT_ARGUMENT = 3; + * ABILITY_META_GLOBAL_FLOAT_VALUE = 7; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_SPECIAL_FLOAT_ARGUMENT_VALUE = 3; + public static final int ABILITY_META_GLOBAL_FLOAT_VALUE_VALUE = 7; /** - * ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM = 4; + * ABILITY_META_CLEAR_GLOBAL_FLOAT_VALUE = 8; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM_VALUE = 4; + public static final int ABILITY_META_CLEAR_GLOBAL_FLOAT_VALUE_VALUE = 8; /** - * ABILITY_INVOKE_ARGUMENT_META_CLEAR_OVERRIDE_PARAM = 5; + * ABILITY_META_ABILITY_ELEMENT_STRENGTH = 9; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_CLEAR_OVERRIDE_PARAM_VALUE = 5; + public static final int ABILITY_META_ABILITY_ELEMENT_STRENGTH_VALUE = 9; /** - * ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP = 6; + * ABILITY_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP_VALUE = 6; + public static final int ABILITY_META_ADD_OR_GET_ABILITY_AND_TRIGGER_VALUE = 10; /** - * ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE = 7; + * ABILITY_META_SET_KILLED_SETATE = 11; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE_VALUE = 7; + public static final int ABILITY_META_SET_KILLED_SETATE_VALUE = 11; /** - * ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE = 8; + * ABILITY_META_SET_ABILITY_TRIGGER = 12; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE_VALUE = 8; + public static final int ABILITY_META_SET_ABILITY_TRIGGER_VALUE = 12; /** - * ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH = 9; + * ABILITY_META_ADD_NEW_ABILITY = 13; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH_VALUE = 9; + public static final int ABILITY_META_ADD_NEW_ABILITY_VALUE = 13; /** - * ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10; + * ABILITY_META_REMOVE_ABILITY = 14; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER_VALUE = 10; + public static final int ABILITY_META_REMOVE_ABILITY_VALUE = 14; /** - * ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE = 11; + * ABILITY_META_SET_MODIFIER_APPLY_ENTITY = 15; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE_VALUE = 11; + public static final int ABILITY_META_SET_MODIFIER_APPLY_ENTITY_VALUE = 15; /** - * ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER = 12; + * ABILITY_META_MODIFIER_DURABILITY_CHANGE = 16; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER_VALUE = 12; + public static final int ABILITY_META_MODIFIER_DURABILITY_CHANGE_VALUE = 16; /** - * ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY = 13; + * ABILITY_META_ELEMENT_REACTION_VISUAL = 17; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY_VALUE = 13; + public static final int ABILITY_META_ELEMENT_REACTION_VISUAL_VALUE = 17; /** - * ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY = 14; + * ABILITY_META_SET_POSE_PARAMETER = 18; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY_VALUE = 14; + public static final int ABILITY_META_SET_POSE_PARAMETER_VALUE = 18; /** - * ABILITY_INVOKE_ARGUMENT_META_SET_MODIFIER_APPLY_ENTITY = 15; + * ABILITY_META_UPDATE_BASE_REACTION_DAMAGE = 19; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_SET_MODIFIER_APPLY_ENTITY_VALUE = 15; + public static final int ABILITY_META_UPDATE_BASE_REACTION_DAMAGE_VALUE = 19; /** - * ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE = 16; + * ABILITY_META_TRIGGER_ELEMENT_REACTION = 20; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE_VALUE = 16; + public static final int ABILITY_META_TRIGGER_ELEMENT_REACTION_VALUE = 20; /** - * ABILITY_INVOKE_ARGUMENT_META_ELEMENT_REACTION_VISUAL = 17; + * ABILITY_META_LOSE_HP = 21; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_ELEMENT_REACTION_VISUAL_VALUE = 17; + public static final int ABILITY_META_LOSE_HP_VALUE = 21; /** - * ABILITY_INVOKE_ARGUMENT_META_SET_POSE_PARAMETER = 18; + * ABILITY_META_DURABILITY_IS_ZERO = 22; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_SET_POSE_PARAMETER_VALUE = 18; + public static final int ABILITY_META_DURABILITY_IS_ZERO_VALUE = 22; /** - * ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE = 19; + * ABILITY_META_TRIGGER_ARKHE_REACTION = 23; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE_VALUE = 19; + public static final int ABILITY_META_TRIGGER_ARKHE_REACTION_VALUE = 23; /** - * ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION = 20; + * ABILITY_META_CHANGE_NYX_VALUE = 24; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION_VALUE = 20; + public static final int ABILITY_META_CHANGE_NYX_VALUE_VALUE = 24; /** - * ABILITY_INVOKE_ARGUMENT_META_LOSE_HP = 21; + * ABILITY_ACTION_TRIGGER_ABILITY = 50; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_LOSE_HP_VALUE = 21; + public static final int ABILITY_ACTION_TRIGGER_ABILITY_VALUE = 50; /** - * ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO = 22; + * ABILITY_ACTION_SET_CRASH_DAMAGE = 51; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO_VALUE = 22; + public static final int ABILITY_ACTION_SET_CRASH_DAMAGE_VALUE = 51; /** - * ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ARKHE_REACTION = 23; + * ABILITY_ACTION_EFFECT = 52; */ - public static final int ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ARKHE_REACTION_VALUE = 23; + public static final int ABILITY_ACTION_EFFECT_VALUE = 52; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50; + * ABILITY_ACTION_SUMMON = 53; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY_VALUE = 50; + public static final int ABILITY_ACTION_SUMMON_VALUE = 53; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE = 51; + * ABILITY_ACTION_BLINK = 54; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE_VALUE = 51; + public static final int ABILITY_ACTION_BLINK_VALUE = 54; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT = 52; + * ABILITY_ACTION_CREATE_GADGET = 55; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT_VALUE = 52; + public static final int ABILITY_ACTION_CREATE_GADGET_VALUE = 55; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON = 53; + * ABILITY_ACTION_APPLY_LEVEL_MODIFIER = 56; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON_VALUE = 53; + public static final int ABILITY_ACTION_APPLY_LEVEL_MODIFIER_VALUE = 56; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_BLINK = 54; + * ABILITY_ACTION_GENERATE_ELEM_BALL = 57; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_BLINK_VALUE = 54; + public static final int ABILITY_ACTION_GENERATE_ELEM_BALL_VALUE = 57; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET = 55; + * ABILITY_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET_VALUE = 55; + public static final int ABILITY_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE_VALUE = 58; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER = 56; + * ABILITY_ACTION_SERVER_MONSTER_LOG = 59; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER_VALUE = 56; + public static final int ABILITY_ACTION_SERVER_MONSTER_LOG_VALUE = 59; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL = 57; + * ABILITY_ACTION_CREATE_TILE = 60; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL_VALUE = 57; + public static final int ABILITY_ACTION_CREATE_TILE_VALUE = 60; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58; + * ABILITY_ACTION_DESTROY_TILE = 61; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE_VALUE = 58; + public static final int ABILITY_ACTION_DESTROY_TILE_VALUE = 61; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG = 59; + * ABILITY_ACTION_FIRE_AFTER_IMAGE = 62; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG_VALUE = 59; + public static final int ABILITY_ACTION_FIRE_AFTER_IMAGE_VALUE = 62; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE = 60; + * ABILITY_ACTION_DEDUCT_STAMINA = 63; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE_VALUE = 60; + public static final int ABILITY_ACTION_DEDUCT_STAMINA_VALUE = 63; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE = 61; + * ABILITY_ACTION_HIT_EFFECT = 64; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE_VALUE = 61; + public static final int ABILITY_ACTION_HIT_EFFECT_VALUE = 64; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE = 62; + * ABILITY_ACTION_SET_BULLET_TRACK_TARGET = 65; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE_VALUE = 62; + public static final int ABILITY_ACTION_SET_BULLET_TRACK_TARGET_VALUE = 65; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA = 63; + * ABILITY_ACTION_FIREWORK_EFFECT = 66; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA_VALUE = 63; + public static final int ABILITY_ACTION_FIREWORK_EFFECT_VALUE = 66; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT = 64; + * ABILITY_ACTION_LEVEL_BANK_ADD_STUFF = 67; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT_VALUE = 64; + public static final int ABILITY_ACTION_LEVEL_BANK_ADD_STUFF_VALUE = 67; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET = 65; + * ABILITY_ACTION_GET_MATERIAL_PARAM_FLOAT = 68; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET_VALUE = 65; + public static final int ABILITY_ACTION_GET_MATERIAL_PARAM_FLOAT_VALUE = 68; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT = 66; + * ABILITY_ACTION_GET_MATERIAL_PARAM_VECTOR = 69; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT_VALUE = 66; + public static final int ABILITY_ACTION_GET_MATERIAL_PARAM_VECTOR_VALUE = 69; /** - * ABILITY_INVOKE_ARGUMENT_ACTION_LEVEL_BANK_ADD_STUFF = 67; + * ABILITY_ACTION_SPECTACLE_BUILD_RECREATE_GADGET = 70; */ - public static final int ABILITY_INVOKE_ARGUMENT_ACTION_LEVEL_BANK_ADD_STUFF_VALUE = 67; + public static final int ABILITY_ACTION_SPECTACLE_BUILD_RECREATE_GADGET_VALUE = 70; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100; + * ABILITY_MIXIN_AVATAR_STEER_BY_CAMERA = 100; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA_VALUE = 100; + public static final int ABILITY_MIXIN_AVATAR_STEER_BY_CAMERA_VALUE = 100; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND = 101; + * ABILITY_MIXIN_MONSTER_DEFEND = 101; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND_VALUE = 101; + public static final int ABILITY_MIXIN_MONSTER_DEFEND_VALUE = 101; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE = 102; + * ABILITY_MIXIN_WIND_ZONE = 102; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE_VALUE = 102; + public static final int ABILITY_MIXIN_WIND_ZONE_VALUE = 102; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA = 103; + * ABILITY_MIXIN_COST_STAMINA = 103; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA_VALUE = 103; + public static final int ABILITY_MIXIN_COST_STAMINA_VALUE = 103; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHIELD = 104; + * ABILITY_MIXIN_ELITE_SHIELD = 104; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHIELD_VALUE = 104; + public static final int ABILITY_MIXIN_ELITE_SHIELD_VALUE = 104; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD = 105; + * ABILITY_MIXIN_ELEMENT_SHIELD = 105; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD_VALUE = 105; + public static final int ABILITY_MIXIN_ELEMENT_SHIELD_VALUE = 105; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SHIELD = 106; + * ABILITY_MIXIN_GLOBAL_SHIELD = 106; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SHIELD_VALUE = 106; + public static final int ABILITY_MIXIN_GLOBAL_SHIELD_VALUE = 106; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_SHIELD_BAR = 107; + * ABILITY_MIXIN_SHIELD_BAR = 107; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_SHIELD_BAR_VALUE = 107; + public static final int ABILITY_MIXIN_SHIELD_BAR_VALUE = 107; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNER = 108; + * ABILITY_MIXIN_WIND_SEED_SPAWNER = 108; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNER_VALUE = 108; + public static final int ABILITY_MIXIN_WIND_SEED_SPAWNER_VALUE = 108; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109; + * ABILITY_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_REACTION_VALUE = 109; + public static final int ABILITY_MIXIN_DO_ACTION_BY_ELEMENT_REACTION_VALUE = 109; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110; + * ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE_VALUE = 110; + public static final int ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE_VALUE = 110; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC = 111; + * ABILITY_MIXIN_SCENE_PROP_SYNC = 111; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC_VALUE = 111; + public static final int ABILITY_MIXIN_SCENE_PROP_SYNC_VALUE = 111; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT = 112; + * ABILITY_MIXIN_WIDGET_MP_SUPPORT = 112; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT_VALUE = 112; + public static final int ABILITY_MIXIN_WIDGET_MP_SUPPORT_VALUE = 112; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO = 113; + * ABILITY_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO = 113; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO_VALUE = 113; + public static final int ABILITY_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO_VALUE = 113; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER = 114; + * ABILITY_MIXIN_FIREWORKS_LAUNCHER = 114; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER_VALUE = 114; + public static final int ABILITY_MIXIN_FIREWORKS_LAUNCHER_VALUE = 114; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115; + * ABILITY_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT_VALUE = 115; + public static final int ABILITY_MIXIN_ATTACK_RESULT_CREATE_COUNT_VALUE = 115; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL = 116; + * ABILITY_MIXIN_UGC_TIME_CONTROL = 116; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL_VALUE = 116; + public static final int ABILITY_MIXIN_UGC_TIME_CONTROL_VALUE = 116; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT = 117; + * ABILITY_MIXIN_AVATAR_COMBAT = 117; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT_VALUE = 117; + public static final int ABILITY_MIXIN_AVATAR_COMBAT_VALUE = 117; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118; + * ABILITY_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN_VALUE = 118; + public static final int ABILITY_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN_VALUE = 118; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT = 119; + * ABILITY_MIXIN_UI_INTERACT = 119; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT_VALUE = 119; + public static final int ABILITY_MIXIN_UI_INTERACT_VALUE = 119; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA = 120; + * ABILITY_MIXIN_SHOOT_FROM_CAMERA = 120; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA_VALUE = 120; + public static final int ABILITY_MIXIN_SHOOT_FROM_CAMERA_VALUE = 120; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY = 121; + * ABILITY_MIXIN_ERASE_BRICK_ACTIVITY = 121; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY_VALUE = 121; + public static final int ABILITY_MIXIN_ERASE_BRICK_ACTIVITY_VALUE = 121; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT = 122; + * ABILITY_MIXIN_BREAKOUT = 122; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT_VALUE = 122; + public static final int ABILITY_MIXIN_BREAKOUT_VALUE = 122; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_DAMAGE_LOAN = 123; + * ABILITY_MIXIN_DAMAGE_LOAN = 123; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_DAMAGE_LOAN_VALUE = 123; + public static final int ABILITY_MIXIN_DAMAGE_LOAN_VALUE = 123; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_BROADCAST_GV = 124; + * ABILITY_MIXIN_BROADCAST_GV = 124; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_BROADCAST_GV_VALUE = 124; + public static final int ABILITY_MIXIN_BROADCAST_GV_VALUE = 124; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_RECEIVE_GV = 125; + * ABILITY_MIXIN_RECEIVE_GV = 125; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_RECEIVE_GV_VALUE = 125; + public static final int ABILITY_MIXIN_RECEIVE_GV_VALUE = 125; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_RAYCAST_SELECT_TARGET = 126; + * ABILITY_MIXIN_RAYCAST_SELECT_TARGET = 126; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_RAYCAST_SELECT_TARGET_VALUE = 126; + public static final int ABILITY_MIXIN_RAYCAST_SELECT_TARGET_VALUE = 126; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET = 127; + * ABILITY_MIXIN_ENERGY_CRYSTAL_TARGET = 127; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET_VALUE = 127; + public static final int ABILITY_MIXIN_ENERGY_CRYSTAL_TARGET_VALUE = 127; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128; + * ABILITY_MIXIN_ROTATION_FOLLOW_CAMERA = 128; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA_VALUE = 128; + public static final int ABILITY_MIXIN_ROTATION_FOLLOW_CAMERA_VALUE = 128; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129; + * ABILITY_MIXIN_BUOYANT_FORCE = 129; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE_VALUE = 129; + public static final int ABILITY_MIXIN_BUOYANT_FORCE_VALUE = 129; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130; + * ABILITY_MIXIN_FILMFEST_BALL_GAME = 130; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME_VALUE = 130; + public static final int ABILITY_MIXIN_FILMFEST_BALL_GAME_VALUE = 130; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131; + * ABILITY_MIXIN_CHECK_SCAN_ENTITY = 131; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY_VALUE = 131; + public static final int ABILITY_MIXIN_CHECK_SCAN_ENTITY_VALUE = 131; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133; + * ABILITY_MIXIN_TIME_TRACK_PLAYER = 133; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER_VALUE = 133; + public static final int ABILITY_MIXIN_TIME_TRACK_PLAYER_VALUE = 133; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW = 134; + * ABILITY_MIXIN_PART_FOLLOW = 134; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW_VALUE = 134; + public static final int ABILITY_MIXIN_PART_FOLLOW_VALUE = 134; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON = 135; + * ABILITY_MIXIN_CHANGE_PHLOGISTON = 135; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON_VALUE = 135; + public static final int ABILITY_MIXIN_CHANGE_PHLOGISTON_VALUE = 135; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136; + * ABILITY_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL_VALUE = 136; + public static final int ABILITY_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL_VALUE = 136; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR = 137; + * ABILITY_MIXIN_FREQUENCY_SHIELD_BAR = 137; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR_VALUE = 137; + public static final int ABILITY_MIXIN_FREQUENCY_SHIELD_BAR_VALUE = 137; /** - * ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA = 141; + * ABILITY_MIXIN_VEHICLE_STEER_BY_CAMERA = 141; */ - public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA_VALUE = 141; + public static final int ABILITY_MIXIN_VEHICLE_STEER_BY_CAMERA_VALUE = 141; public final int getNumber() { @@ -688,86 +720,90 @@ public static AbilityInvokeArgument valueOf(int value) { */ public static AbilityInvokeArgument forNumber(int value) { switch (value) { - case 0: return ABILITY_INVOKE_ARGUMENT_NONE; - case 1: return ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE; - case 2: return ABILITY_INVOKE_ARGUMENT_META_COMMAND_MODIFIER_CHANGE_REQUEST; - case 3: return ABILITY_INVOKE_ARGUMENT_META_SPECIAL_FLOAT_ARGUMENT; - case 4: return ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM; - case 5: return ABILITY_INVOKE_ARGUMENT_META_CLEAR_OVERRIDE_PARAM; - case 6: return ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP; - case 7: return ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE; - case 8: return ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE; - case 9: return ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH; - case 10: return ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER; - case 11: return ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE; - case 12: return ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER; - case 13: return ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY; - case 14: return ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY; - case 15: return ABILITY_INVOKE_ARGUMENT_META_SET_MODIFIER_APPLY_ENTITY; - case 16: return ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE; - case 17: return ABILITY_INVOKE_ARGUMENT_META_ELEMENT_REACTION_VISUAL; - case 18: return ABILITY_INVOKE_ARGUMENT_META_SET_POSE_PARAMETER; - case 19: return ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE; - case 20: return ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION; - case 21: return ABILITY_INVOKE_ARGUMENT_META_LOSE_HP; - case 22: return ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO; - case 23: return ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ARKHE_REACTION; - case 50: return ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY; - case 51: return ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE; - case 52: return ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT; - case 53: return ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON; - case 54: return ABILITY_INVOKE_ARGUMENT_ACTION_BLINK; - case 55: return ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET; - case 56: return ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER; - case 57: return ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL; - case 58: return ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE; - case 59: return ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG; - case 60: return ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE; - case 61: return ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE; - case 62: return ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE; - case 63: return ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA; - case 64: return ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT; - case 65: return ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET; - case 66: return ABILITY_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT; - case 67: return ABILITY_INVOKE_ARGUMENT_ACTION_LEVEL_BANK_ADD_STUFF; - case 100: return ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA; - case 101: return ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND; - case 102: return ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE; - case 103: return ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA; - case 104: return ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHIELD; - case 105: return ABILITY_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD; - case 106: return ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SHIELD; - case 107: return ABILITY_INVOKE_ARGUMENT_MIXIN_SHIELD_BAR; - case 108: return ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNER; - case 109: return ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_REACTION; - case 110: return ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE; - case 111: return ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC; - case 112: return ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT; - case 113: return ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO; - case 114: return ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER; - case 115: return ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT; - case 116: return ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL; - case 117: return ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT; - case 118: return ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN; - case 119: return ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT; - case 120: return ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA; - case 121: return ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY; - case 122: return ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT; - case 123: return ABILITY_INVOKE_ARGUMENT_MIXIN_DAMAGE_LOAN; - case 124: return ABILITY_INVOKE_ARGUMENT_MIXIN_BROADCAST_GV; - case 125: return ABILITY_INVOKE_ARGUMENT_MIXIN_RECEIVE_GV; - case 126: return ABILITY_INVOKE_ARGUMENT_MIXIN_RAYCAST_SELECT_TARGET; - case 127: return ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET; - case 128: return ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA; - case 129: return ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE; - case 130: return ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME; - case 131: return ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY; - case 133: return ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER; - case 134: return ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW; - case 135: return ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON; - case 136: return ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL; - case 137: return ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR; - case 141: return ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA; + case 0: return ABILITY_NONE; + case 1: return ABILITY_META_MODIFIER_CHANGE; + case 2: return ABILITY_META_COMMAND_MODIFIER_CHANGE_REQUEST; + case 3: return ABILITY_META_SPECIAL_FLOAT_ARGUMENT; + case 4: return ABILITY_META_OVERRIDE_PARAM; + case 5: return ABILITY_META_CLEAR_OVERRIDE_PARAM; + case 6: return ABILITY_META_REINIT_OVERRIDEMAP; + case 7: return ABILITY_META_GLOBAL_FLOAT_VALUE; + case 8: return ABILITY_META_CLEAR_GLOBAL_FLOAT_VALUE; + case 9: return ABILITY_META_ABILITY_ELEMENT_STRENGTH; + case 10: return ABILITY_META_ADD_OR_GET_ABILITY_AND_TRIGGER; + case 11: return ABILITY_META_SET_KILLED_SETATE; + case 12: return ABILITY_META_SET_ABILITY_TRIGGER; + case 13: return ABILITY_META_ADD_NEW_ABILITY; + case 14: return ABILITY_META_REMOVE_ABILITY; + case 15: return ABILITY_META_SET_MODIFIER_APPLY_ENTITY; + case 16: return ABILITY_META_MODIFIER_DURABILITY_CHANGE; + case 17: return ABILITY_META_ELEMENT_REACTION_VISUAL; + case 18: return ABILITY_META_SET_POSE_PARAMETER; + case 19: return ABILITY_META_UPDATE_BASE_REACTION_DAMAGE; + case 20: return ABILITY_META_TRIGGER_ELEMENT_REACTION; + case 21: return ABILITY_META_LOSE_HP; + case 22: return ABILITY_META_DURABILITY_IS_ZERO; + case 23: return ABILITY_META_TRIGGER_ARKHE_REACTION; + case 24: return ABILITY_META_CHANGE_NYX_VALUE; + case 50: return ABILITY_ACTION_TRIGGER_ABILITY; + case 51: return ABILITY_ACTION_SET_CRASH_DAMAGE; + case 52: return ABILITY_ACTION_EFFECT; + case 53: return ABILITY_ACTION_SUMMON; + case 54: return ABILITY_ACTION_BLINK; + case 55: return ABILITY_ACTION_CREATE_GADGET; + case 56: return ABILITY_ACTION_APPLY_LEVEL_MODIFIER; + case 57: return ABILITY_ACTION_GENERATE_ELEM_BALL; + case 58: return ABILITY_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE; + case 59: return ABILITY_ACTION_SERVER_MONSTER_LOG; + case 60: return ABILITY_ACTION_CREATE_TILE; + case 61: return ABILITY_ACTION_DESTROY_TILE; + case 62: return ABILITY_ACTION_FIRE_AFTER_IMAGE; + case 63: return ABILITY_ACTION_DEDUCT_STAMINA; + case 64: return ABILITY_ACTION_HIT_EFFECT; + case 65: return ABILITY_ACTION_SET_BULLET_TRACK_TARGET; + case 66: return ABILITY_ACTION_FIREWORK_EFFECT; + case 67: return ABILITY_ACTION_LEVEL_BANK_ADD_STUFF; + case 68: return ABILITY_ACTION_GET_MATERIAL_PARAM_FLOAT; + case 69: return ABILITY_ACTION_GET_MATERIAL_PARAM_VECTOR; + case 70: return ABILITY_ACTION_SPECTACLE_BUILD_RECREATE_GADGET; + case 100: return ABILITY_MIXIN_AVATAR_STEER_BY_CAMERA; + case 101: return ABILITY_MIXIN_MONSTER_DEFEND; + case 102: return ABILITY_MIXIN_WIND_ZONE; + case 103: return ABILITY_MIXIN_COST_STAMINA; + case 104: return ABILITY_MIXIN_ELITE_SHIELD; + case 105: return ABILITY_MIXIN_ELEMENT_SHIELD; + case 106: return ABILITY_MIXIN_GLOBAL_SHIELD; + case 107: return ABILITY_MIXIN_SHIELD_BAR; + case 108: return ABILITY_MIXIN_WIND_SEED_SPAWNER; + case 109: return ABILITY_MIXIN_DO_ACTION_BY_ELEMENT_REACTION; + case 110: return ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE; + case 111: return ABILITY_MIXIN_SCENE_PROP_SYNC; + case 112: return ABILITY_MIXIN_WIDGET_MP_SUPPORT; + case 113: return ABILITY_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO; + case 114: return ABILITY_MIXIN_FIREWORKS_LAUNCHER; + case 115: return ABILITY_MIXIN_ATTACK_RESULT_CREATE_COUNT; + case 116: return ABILITY_MIXIN_UGC_TIME_CONTROL; + case 117: return ABILITY_MIXIN_AVATAR_COMBAT; + case 118: return ABILITY_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN; + case 119: return ABILITY_MIXIN_UI_INTERACT; + case 120: return ABILITY_MIXIN_SHOOT_FROM_CAMERA; + case 121: return ABILITY_MIXIN_ERASE_BRICK_ACTIVITY; + case 122: return ABILITY_MIXIN_BREAKOUT; + case 123: return ABILITY_MIXIN_DAMAGE_LOAN; + case 124: return ABILITY_MIXIN_BROADCAST_GV; + case 125: return ABILITY_MIXIN_RECEIVE_GV; + case 126: return ABILITY_MIXIN_RAYCAST_SELECT_TARGET; + case 127: return ABILITY_MIXIN_ENERGY_CRYSTAL_TARGET; + case 128: return ABILITY_MIXIN_ROTATION_FOLLOW_CAMERA; + case 129: return ABILITY_MIXIN_BUOYANT_FORCE; + case 130: return ABILITY_MIXIN_FILMFEST_BALL_GAME; + case 131: return ABILITY_MIXIN_CHECK_SCAN_ENTITY; + case 133: return ABILITY_MIXIN_TIME_TRACK_PLAYER; + case 134: return ABILITY_MIXIN_PART_FOLLOW; + case 135: return ABILITY_MIXIN_CHANGE_PHLOGISTON; + case 136: return ABILITY_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL; + case 137: return ABILITY_MIXIN_FREQUENCY_SHIELD_BAR; + case 141: return ABILITY_MIXIN_VEHICLE_STEER_BY_CAMERA; default: return null; } } @@ -833,117 +869,89 @@ private AbilityInvokeArgument(int value) { descriptor; static { java.lang.String[] descriptorData = { - "\n\033AbilityInvokeArgument.proto*\360!\n\025Abilit" + - "yInvokeArgument\022 \n\034ABILITY_INVOKE_ARGUME" + - "NT_NONE\020\000\0220\n,ABILITY_INVOKE_ARGUMENT_MET" + - "A_MODIFIER_CHANGE\020\001\022@\n\0221\n-ABILI" + - "TY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA" + - "\020?\022-\n)ABILITY_INVOKE_ARGUMENT_ACTION_HIT" + - "_EFFECT\020@\022:\n6ABILITY_INVOKE_ARGUMENT_ACT" + - "ION_SET_BULLET_TRACK_TARGET\020A\0222\n.ABILITY" + - "_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT\020" + - "B\0227\n3ABILITY_INVOKE_ARGUMENT_ACTION_LEVE" + - "L_BANK_ADD_STUFF\020C\0228\n4ABILITY_INVOKE_ARG" + - "UMENT_MIXIN_AVATAR_STEER_BY_CAMERA\020d\0220\n," + - "ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DE" + - "FEND\020e\022+\n\'ABILITY_INVOKE_ARGUMENT_MIXIN_" + - "WIND_ZONE\020f\022.\n*ABILITY_INVOKE_ARGUMENT_M" + - "IXIN_COST_STAMINA\020g\022.\n*ABILITY_INVOKE_AR" + - "GUMENT_MIXIN_ELITE_SHIELD\020h\0220\n,ABILITY_I" + - "NVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD\020i\022/\n" + - "+ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SH" + - "IELD\020j\022,\n(ABILITY_INVOKE_ARGUMENT_MIXIN_" + - "SHIELD_BAR\020k\0223\n/ABILITY_INVOKE_ARGUMENT_" + - "MIXIN_WIND_SEED_SPAWNER\020l\022?\n;ABILITY_INV" + - "OKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_" + - "REACTION\020m\022;\n7ABILITY_INVOKE_ARGUMENT_MI" + - "XIN_FIELD_ENTITY_COUNT_CHANGE\020n\0221\n-ABILI" + - "TY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC" + - "\020o\0223\n/ABILITY_INVOKE_ARGUMENT_MIXIN_WIDG" + - "ET_MP_SUPPORT\020p\022U\nQABILITY_INVOKE_ARGUME" + - "NT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEM" + - "ENT_DURABILITY_RATIO\020q\0224\n0ABILITY_INVOKE" + - "_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER\020r\022<\n8" + - "ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RES" + - "ULT_CREATE_COUNT\020s\0222\n.ABILITY_INVOKE_ARG" + - "UMENT_MIXIN_UGC_TIME_CONTROL\020t\022/\n+ABILIT" + - "Y_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT\020u\022" + - "@\n\022!\n\035AB" + + "ILITY_ACTION_DEDUCT_STAMINA\020?\022\035\n\031ABILITY" + + "_ACTION_HIT_EFFECT\020@\022*\n&ABILITY_ACTION_S" + + "ET_BULLET_TRACK_TARGET\020A\022\"\n\036ABILITY_ACTI" + + "ON_FIREWORK_EFFECT\020B\022\'\n#ABILITY_ACTION_L" + + "EVEL_BANK_ADD_STUFF\020C\022+\n\'ABILITY_ACTION_" + + "GET_MATERIAL_PARAM_FLOAT\020D\022,\n(ABILITY_AC" + + "TION_GET_MATERIAL_PARAM_VECTOR\020E\0222\n.ABIL" + + "ITY_ACTION_SPECTACLE_BUILD_RECREATE_GADG" + + "ET\020F\022(\n$ABILITY_MIXIN_AVATAR_STEER_BY_CA" + + "MERA\020d\022 \n\034ABILITY_MIXIN_MONSTER_DEFEND\020e" + + "\022\033\n\027ABILITY_MIXIN_WIND_ZONE\020f\022\036\n\032ABILITY" + + "_MIXIN_COST_STAMINA\020g\022\036\n\032ABILITY_MIXIN_E" + + "LITE_SHIELD\020h\022 \n\034ABILITY_MIXIN_ELEMENT_S" + + "HIELD\020i\022\037\n\033ABILITY_MIXIN_GLOBAL_SHIELD\020j" + + "\022\034\n\030ABILITY_MIXIN_SHIELD_BAR\020k\022#\n\037ABILIT" + + "Y_MIXIN_WIND_SEED_SPAWNER\020l\022/\n+ABILITY_M" + + "IXIN_DO_ACTION_BY_ELEMENT_REACTION\020m\022+\n\'" + + "ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE\020" + + "n\022!\n\035ABILITY_MIXIN_SCENE_PROP_SYNC\020o\022#\n\037" + + "ABILITY_MIXIN_WIDGET_MP_SUPPORT\020p\022E\nAABI" + + "LITY_MIXIN_DO_ACTION_BY_SELF_MODIFIER_EL" + + "EMENT_DURABILITY_RATIO\020q\022$\n ABILITY_MIXI" + + "N_FIREWORKS_LAUNCHER\020r\022,\n(ABILITY_MIXIN_" + + "ATTACK_RESULT_CREATE_COUNT\020s\022\"\n\036ABILITY_" + + "MIXIN_UGC_TIME_CONTROL\020t\022\037\n\033ABILITY_MIXI" + + "N_AVATAR_COMBAT\020u\0220\n,ABILITY_MIXIN_DEATH" + + "_ZONE_REGIONAL_PLAY_MIXIN\020v\022\035\n\031ABILITY_M" + + "IXIN_UI_INTERACT\020w\022#\n\037ABILITY_MIXIN_SHOO" + + "T_FROM_CAMERA\020x\022&\n\"ABILITY_MIXIN_ERASE_B" + + "RICK_ACTIVITY\020y\022\032\n\026ABILITY_MIXIN_BREAKOU" + + "T\020z\022\035\n\031ABILITY_MIXIN_DAMAGE_LOAN\020{\022\036\n\032AB" + + "ILITY_MIXIN_BROADCAST_GV\020|\022\034\n\030ABILITY_MI" + + "XIN_RECEIVE_GV\020}\022\'\n#ABILITY_MIXIN_RAYCAS" + + "T_SELECT_TARGET\020~\022\'\n#ABILITY_MIXIN_ENERG" + + "Y_CRYSTAL_TARGET\020\177\022)\n$ABILITY_MIXIN_ROTA" + + "TION_FOLLOW_CAMERA\020\200\001\022 \n\033ABILITY_MIXIN_B" + + "UOYANT_FORCE\020\201\001\022%\n ABILITY_MIXIN_FILMFES" + + "T_BALL_GAME\020\202\001\022$\n\037ABILITY_MIXIN_CHECK_SC" + + "AN_ENTITY\020\203\001\022$\n\037ABILITY_MIXIN_TIME_TRACK" + + "_PLAYER\020\205\001\022\036\n\031ABILITY_MIXIN_PART_FOLLOW\020" + + "\206\001\022$\n\037ABILITY_MIXIN_CHANGE_PHLOGISTON\020\207\001" + + "\022;\n6ABILITY_MIXIN_HUMAN_DRAGON_COLLAB_PI" + + "CK_PHLOGISTON_BALL\020\210\001\022\'\n\"ABILITY_MIXIN_F" + + "REQUENCY_SHIELD_BAR\020\211\001\022*\n%ABILITY_MIXIN_" + + "VEHICLE_STEER_BY_CAMERA\020\215\001B\033\n\031emu.grassc" + + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java index 2f1e4bdc010..88256a7d64f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java @@ -373,7 +373,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (eventId_ != 0) { output.writeUInt32(2, eventId_); } - if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) { + if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_NONE.getNumber()) { output.writeEnum(3, argumentType_); } if (forwardPeer_ != 0) { @@ -410,7 +410,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, eventId_); } - if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) { + if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_NONE.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(3, argumentType_); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaAddAbilityOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaAddAbilityOuterClass.java index df61e787f80..78717e477fa 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaAddAbilityOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaAddAbilityOuterClass.java @@ -19,23 +19,23 @@ public interface AbilityMetaAddAbilityOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; * @return Whether the ability field is set. */ boolean hasAbility(); /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; * @return The ability. */ emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility getAbility(); /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbilityOrBuilder getAbilityOrBuilder(); } /** * 
-   * Obf: GOIHMEADCCK
+   * obf: AAMKCDCJNHP
    *
* * Protobuf type {@code AbilityMetaAddAbility} @@ -82,7 +82,7 @@ private AbilityMetaAddAbility( case 0: done = true; break; - case 74: { + case 66: { emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility.Builder subBuilder = null; if (ability_ != null) { subBuilder = ability_.toBuilder(); @@ -127,10 +127,10 @@ private AbilityMetaAddAbility( emu.grasscutter.net.proto.AbilityMetaAddAbilityOuterClass.AbilityMetaAddAbility.class, emu.grasscutter.net.proto.AbilityMetaAddAbilityOuterClass.AbilityMetaAddAbility.Builder.class); } - public static final int ABILITY_FIELD_NUMBER = 9; + public static final int ABILITY_FIELD_NUMBER = 8; private emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility ability_; /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; * @return Whether the ability field is set. */ @java.lang.Override @@ -138,7 +138,7 @@ public boolean hasAbility() { return ability_ != null; } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; * @return The ability. */ @java.lang.Override @@ -146,7 +146,7 @@ public emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedA return ability_ == null ? emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility.getDefaultInstance() : ability_; } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbilityOrBuilder getAbilityOrBuilder() { @@ -168,7 +168,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (ability_ != null) { - output.writeMessage(9, getAbility()); + output.writeMessage(8, getAbility()); } unknownFields.writeTo(output); } @@ -181,7 +181,7 @@ public int getSerializedSize() { size = 0; if (ability_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, getAbility()); + .computeMessageSize(8, getAbility()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -315,7 +315,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: GOIHMEADCCK
+     * obf: AAMKCDCJNHP
      *
* * Protobuf type {@code AbilityMetaAddAbility} @@ -476,14 +476,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility, emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility.Builder, emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbilityOrBuilder> abilityBuilder_; /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; * @return Whether the ability field is set. */ public boolean hasAbility() { return abilityBuilder_ != null || ability_ != null; } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; * @return The ability. */ public emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility getAbility() { @@ -494,7 +494,7 @@ public emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedA } } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ public Builder setAbility(emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility value) { if (abilityBuilder_ == null) { @@ -510,7 +510,7 @@ public Builder setAbility(emu.grasscutter.net.proto.AbilityAppliedAbilityOuterCl return this; } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ public Builder setAbility( emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility.Builder builderForValue) { @@ -524,7 +524,7 @@ public Builder setAbility( return this; } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ public Builder mergeAbility(emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility value) { if (abilityBuilder_ == null) { @@ -542,7 +542,7 @@ public Builder mergeAbility(emu.grasscutter.net.proto.AbilityAppliedAbilityOuter return this; } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ public Builder clearAbility() { if (abilityBuilder_ == null) { @@ -556,7 +556,7 @@ public Builder clearAbility() { return this; } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ public emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility.Builder getAbilityBuilder() { @@ -564,7 +564,7 @@ public emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedA return getAbilityFieldBuilder().getBuilder(); } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ public emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbilityOrBuilder getAbilityOrBuilder() { if (abilityBuilder_ != null) { @@ -575,7 +575,7 @@ public emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedA } } /** - * .AbilityAppliedAbility ability = 9; + * .AbilityAppliedAbility ability = 8; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility, emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbility.Builder, emu.grasscutter.net.proto.AbilityAppliedAbilityOuterClass.AbilityAppliedAbilityOrBuilder> @@ -659,7 +659,7 @@ public emu.grasscutter.net.proto.AbilityMetaAddAbilityOuterClass.AbilityMetaAddA java.lang.String[] descriptorData = { "\n\033AbilityMetaAddAbility.proto\032\033AbilityAp" + "pliedAbility.proto\"@\n\025AbilityMetaAddAbil" + - "ity\022\'\n\007ability\030\t \001(\0132\026.AbilityAppliedAbi" + + "ity\022\'\n\007ability\030\010 \001(\0132\026.AbilityAppliedAbi" + "lityB\033\n\031emu.grasscutter.net.protob\006proto" + "3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaModifierChangeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaModifierChangeOuterClass.java index c49ac2cdfe1..afd3d6d12d5 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaModifierChangeOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaModifierChangeOuterClass.java @@ -19,124 +19,136 @@ public interface AbilityMetaModifierChangeOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; * @return Whether the attachedInstancedModifier field is set. */ boolean hasAttachedInstancedModifier(); /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; * @return The attachedInstancedModifier. */ emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier getAttachedInstancedModifier(); /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifierOrBuilder getAttachedInstancedModifierOrBuilder(); /** - * uint32 server_buff_uid = 5; - * @return The serverBuffUid. + * int32 modifier_local_id = 2; + * @return The modifierLocalId. */ - int getServerBuffUid(); + int getModifierLocalId(); /** - * repeated .ModifierProperty properties = 6; + * bool is_attached_parent_ability = 3; + * @return The isAttachedParentAbility. */ - java.util.List - getPropertiesList(); + boolean getIsAttachedParentAbility(); + /** - * repeated .ModifierProperty properties = 6; + * uint64 EBAFPMJDPBC = 5; + * @return The eBAFPMJDPBC. */ - emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty getProperties(int index); + long getEBAFPMJDPBC(); + /** - * repeated .ModifierProperty properties = 6; + * float LDJJJKNABGD = 6; + * @return The lDJJJKNABGD. */ - int getPropertiesCount(); + float getLDJJJKNABGD(); + /** - * repeated .ModifierProperty properties = 6; + * .ModifierAction action = 7; + * @return The enum numeric value on the wire for action. */ - java.util.List - getPropertiesOrBuilderList(); + int getActionValue(); /** - * repeated .ModifierProperty properties = 6; + * .ModifierAction action = 7; + * @return The action. */ - emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder getPropertiesOrBuilder( - int index); + emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction getAction(); /** - * bool BNMCKEBPDGI = 11; - * @return The bNMCKEBPDGI. + * bool INGHBKHOLMO = 8; + * @return The iNGHBKHOLMO. */ - boolean getBNMCKEBPDGI(); + boolean getINGHBKHOLMO(); /** - * bool is_attached_parent_ability = 2; - * @return The isAttachedParentAbility. + * .AbilityString parent_ability_override = 9; + * @return Whether the parentAbilityOverride field is set. */ - boolean getIsAttachedParentAbility(); - + boolean hasParentAbilityOverride(); /** - * uint32 apply_entity_id = 9; - * @return The applyEntityId. + * .AbilityString parent_ability_override = 9; + * @return The parentAbilityOverride. */ - int getApplyEntityId(); + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParentAbilityOverride(); + /** + * .AbilityString parent_ability_override = 9; + */ + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityOverrideOrBuilder(); /** - * .ModifierAction action = 1; - * @return The enum numeric value on the wire for action. + * repeated .ModifierProperty properties = 10; */ - int getActionValue(); + java.util.List + getPropertiesList(); /** - * .ModifierAction action = 1; - * @return The action. + * repeated .ModifierProperty properties = 10; */ - emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction getAction(); - + emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty getProperties(int index); + /** + * repeated .ModifierProperty properties = 10; + */ + int getPropertiesCount(); + /** + * repeated .ModifierProperty properties = 10; + */ + java.util.List + getPropertiesOrBuilderList(); /** - * bool HEDGMMNKADC = 10; - * @return The hEDGMMNKADC. + * repeated .ModifierProperty properties = 10; */ - boolean getHEDGMMNKADC(); + emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder getPropertiesOrBuilder( + int index); /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; * @return Whether the parentAbilityName field is set. */ boolean hasParentAbilityName(); /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; * @return The parentAbilityName. */ emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParentAbilityName(); /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityNameOrBuilder(); /** - * .AbilityString parent_ability_override = 8; - * @return Whether the parentAbilityOverride field is set. - */ - boolean hasParentAbilityOverride(); - /** - * .AbilityString parent_ability_override = 8; - * @return The parentAbilityOverride. + * uint32 server_buff_uid = 12; + * @return The serverBuffUid. */ - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParentAbilityOverride(); + int getServerBuffUid(); + /** - * .AbilityString parent_ability_override = 8; + * uint32 apply_entity_id = 13; + * @return The applyEntityId. */ - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityOverrideOrBuilder(); + int getApplyEntityId(); /** - * int32 modifier_local_id = 14; - * @return The modifierLocalId. + * bool FCBFPCNFHLA = 15; + * @return The fCBFPCNFHLA. */ - int getModifierLocalId(); + boolean getFCBFPCNFHLA(); } /** * 
-   * Obf: FFBMKELHDNF
+   * obf: EKODCPMLOAJ
    *
* * Protobuf type {@code AbilityMetaModifierChange} @@ -151,8 +163,8 @@ private AbilityMetaModifierChange(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } private AbilityMetaModifierChange() { - properties_ = java.util.Collections.emptyList(); action_ = 0; + properties_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -186,45 +198,51 @@ private AbilityMetaModifierChange( case 0: done = true; break; - case 8: { - int rawValue = input.readEnum(); + case 10: { + emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.Builder subBuilder = null; + if (attachedInstancedModifier_ != null) { + subBuilder = attachedInstancedModifier_.toBuilder(); + } + attachedInstancedModifier_ = input.readMessage(emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(attachedInstancedModifier_); + attachedInstancedModifier_ = subBuilder.buildPartial(); + } - action_ = rawValue; break; } case 16: { + modifierLocalId_ = input.readInt32(); + break; + } + case 24: { + isAttachedParentAbility_ = input.readBool(); break; } case 40: { - serverBuffUid_ = input.readUInt32(); + eBAFPMJDPBC_ = input.readUInt64(); break; } - case 50: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - properties_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - properties_.add( - input.readMessage(emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.parser(), extensionRegistry)); + case 53: { + + lDJJJKNABGD_ = input.readFloat(); break; } - case 58: { - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder subBuilder = null; - if (parentAbilityName_ != null) { - subBuilder = parentAbilityName_.toBuilder(); - } - parentAbilityName_ = input.readMessage(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(parentAbilityName_); - parentAbilityName_ = subBuilder.buildPartial(); - } + case 56: { + int rawValue = input.readEnum(); + + action_ = rawValue; + break; + } + case 64: { + iNGHBKHOLMO_ = input.readBool(); break; } - case 66: { + case 74: { emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder subBuilder = null; if (parentAbilityOverride_ != null) { subBuilder = parentAbilityOverride_.toBuilder(); @@ -237,37 +255,41 @@ private AbilityMetaModifierChange( break; } - case 72: { - - applyEntityId_ = input.readUInt32(); + case 82: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + properties_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + properties_.add( + input.readMessage(emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.parser(), extensionRegistry)); break; } - case 80: { + case 90: { + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder subBuilder = null; + if (parentAbilityName_ != null) { + subBuilder = parentAbilityName_.toBuilder(); + } + parentAbilityName_ = input.readMessage(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(parentAbilityName_); + parentAbilityName_ = subBuilder.buildPartial(); + } - hEDGMMNKADC_ = input.readBool(); break; } - case 88: { + case 96: { - bNMCKEBPDGI_ = input.readBool(); + serverBuffUid_ = input.readUInt32(); break; } - case 112: { + case 104: { - modifierLocalId_ = input.readInt32(); + applyEntityId_ = input.readUInt32(); break; } - case 122: { - emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.Builder subBuilder = null; - if (attachedInstancedModifier_ != null) { - subBuilder = attachedInstancedModifier_.toBuilder(); - } - attachedInstancedModifier_ = input.readMessage(emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(attachedInstancedModifier_); - attachedInstancedModifier_ = subBuilder.buildPartial(); - } + case 120: { + fCBFPCNFHLA_ = input.readBool(); break; } default: { @@ -305,10 +327,10 @@ private AbilityMetaModifierChange( emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange.class, emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange.Builder.class); } - public static final int ATTACHED_INSTANCED_MODIFIER_FIELD_NUMBER = 15; + public static final int ATTACHED_INSTANCED_MODIFIER_FIELD_NUMBER = 1; private emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier attachedInstancedModifier_; /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; * @return Whether the attachedInstancedModifier field is set. */ @java.lang.Override @@ -316,7 +338,7 @@ public boolean hasAttachedInstancedModifier() { return attachedInstancedModifier_ != null; } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; * @return The attachedInstancedModifier. */ @java.lang.Override @@ -324,131 +346,157 @@ public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttach return attachedInstancedModifier_ == null ? emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.getDefaultInstance() : attachedInstancedModifier_; } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifierOrBuilder getAttachedInstancedModifierOrBuilder() { return getAttachedInstancedModifier(); } - public static final int SERVER_BUFF_UID_FIELD_NUMBER = 5; - private int serverBuffUid_; + public static final int MODIFIER_LOCAL_ID_FIELD_NUMBER = 2; + private int modifierLocalId_; /** - * uint32 server_buff_uid = 5; - * @return The serverBuffUid. + * int32 modifier_local_id = 2; + * @return The modifierLocalId. */ @java.lang.Override - public int getServerBuffUid() { - return serverBuffUid_; + public int getModifierLocalId() { + return modifierLocalId_; } - public static final int PROPERTIES_FIELD_NUMBER = 6; - private java.util.List properties_; + public static final int IS_ATTACHED_PARENT_ABILITY_FIELD_NUMBER = 3; + private boolean isAttachedParentAbility_; /** - * repeated .ModifierProperty properties = 6; + * bool is_attached_parent_ability = 3; + * @return The isAttachedParentAbility. */ @java.lang.Override - public java.util.List getPropertiesList() { - return properties_; + public boolean getIsAttachedParentAbility() { + return isAttachedParentAbility_; } + + public static final int EBAFPMJDPBC_FIELD_NUMBER = 5; + private long eBAFPMJDPBC_; /** - * repeated .ModifierProperty properties = 6; + * uint64 EBAFPMJDPBC = 5; + * @return The eBAFPMJDPBC. */ @java.lang.Override - public java.util.List - getPropertiesOrBuilderList() { - return properties_; + public long getEBAFPMJDPBC() { + return eBAFPMJDPBC_; } + + public static final int LDJJJKNABGD_FIELD_NUMBER = 6; + private float lDJJJKNABGD_; /** - * repeated .ModifierProperty properties = 6; + * float LDJJJKNABGD = 6; + * @return The lDJJJKNABGD. */ @java.lang.Override - public int getPropertiesCount() { - return properties_.size(); + public float getLDJJJKNABGD() { + return lDJJJKNABGD_; } + + public static final int ACTION_FIELD_NUMBER = 7; + private int action_; /** - * repeated .ModifierProperty properties = 6; + * .ModifierAction action = 7; + * @return The enum numeric value on the wire for action. */ - @java.lang.Override - public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty getProperties(int index) { - return properties_.get(index); + @java.lang.Override public int getActionValue() { + return action_; } /** - * repeated .ModifierProperty properties = 6; + * .ModifierAction action = 7; + * @return The action. */ - @java.lang.Override - public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder getPropertiesOrBuilder( - int index) { - return properties_.get(index); + @java.lang.Override public emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction getAction() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction result = emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.valueOf(action_); + return result == null ? emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.UNRECOGNIZED : result; } - public static final int BNMCKEBPDGI_FIELD_NUMBER = 11; - private boolean bNMCKEBPDGI_; + public static final int INGHBKHOLMO_FIELD_NUMBER = 8; + private boolean iNGHBKHOLMO_; /** - * bool BNMCKEBPDGI = 11; - * @return The bNMCKEBPDGI. + * bool INGHBKHOLMO = 8; + * @return The iNGHBKHOLMO. */ @java.lang.Override - public boolean getBNMCKEBPDGI() { - return bNMCKEBPDGI_; + public boolean getINGHBKHOLMO() { + return iNGHBKHOLMO_; } - public static final int IS_ATTACHED_PARENT_ABILITY_FIELD_NUMBER = 2; - private boolean isAttachedParentAbility_; + public static final int PARENT_ABILITY_OVERRIDE_FIELD_NUMBER = 9; + private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString parentAbilityOverride_; /** - * bool is_attached_parent_ability = 2; - * @return The isAttachedParentAbility. + * .AbilityString parent_ability_override = 9; + * @return Whether the parentAbilityOverride field is set. */ @java.lang.Override - public boolean getIsAttachedParentAbility() { - return isAttachedParentAbility_; + public boolean hasParentAbilityOverride() { + return parentAbilityOverride_ != null; } - - public static final int APPLY_ENTITY_ID_FIELD_NUMBER = 9; - private int applyEntityId_; /** - * uint32 apply_entity_id = 9; - * @return The applyEntityId. + * .AbilityString parent_ability_override = 9; + * @return The parentAbilityOverride. */ @java.lang.Override - public int getApplyEntityId() { - return applyEntityId_; + public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParentAbilityOverride() { + return parentAbilityOverride_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : parentAbilityOverride_; + } + /** + * .AbilityString parent_ability_override = 9; + */ + @java.lang.Override + public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityOverrideOrBuilder() { + return getParentAbilityOverride(); } - public static final int ACTION_FIELD_NUMBER = 1; - private int action_; + public static final int PROPERTIES_FIELD_NUMBER = 10; + private java.util.List properties_; /** - * .ModifierAction action = 1; - * @return The enum numeric value on the wire for action. + * repeated .ModifierProperty properties = 10; */ - @java.lang.Override public int getActionValue() { - return action_; + @java.lang.Override + public java.util.List getPropertiesList() { + return properties_; } /** - * .ModifierAction action = 1; - * @return The action. + * repeated .ModifierProperty properties = 10; */ - @java.lang.Override public emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction getAction() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction result = emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.valueOf(action_); - return result == null ? emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.UNRECOGNIZED : result; + @java.lang.Override + public java.util.List + getPropertiesOrBuilderList() { + return properties_; + } + /** + * repeated .ModifierProperty properties = 10; + */ + @java.lang.Override + public int getPropertiesCount() { + return properties_.size(); + } + /** + * repeated .ModifierProperty properties = 10; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty getProperties(int index) { + return properties_.get(index); } - - public static final int HEDGMMNKADC_FIELD_NUMBER = 10; - private boolean hEDGMMNKADC_; /** - * bool HEDGMMNKADC = 10; - * @return The hEDGMMNKADC. + * repeated .ModifierProperty properties = 10; */ @java.lang.Override - public boolean getHEDGMMNKADC() { - return hEDGMMNKADC_; + public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder getPropertiesOrBuilder( + int index) { + return properties_.get(index); } - public static final int PARENT_ABILITY_NAME_FIELD_NUMBER = 7; + public static final int PARENT_ABILITY_NAME_FIELD_NUMBER = 11; private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString parentAbilityName_; /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; * @return Whether the parentAbilityName field is set. */ @java.lang.Override @@ -456,7 +504,7 @@ public boolean hasParentAbilityName() { return parentAbilityName_ != null; } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; * @return The parentAbilityName. */ @java.lang.Override @@ -464,48 +512,44 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParent return parentAbilityName_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : parentAbilityName_; } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityNameOrBuilder() { return getParentAbilityName(); } - public static final int PARENT_ABILITY_OVERRIDE_FIELD_NUMBER = 8; - private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString parentAbilityOverride_; - /** - * .AbilityString parent_ability_override = 8; - * @return Whether the parentAbilityOverride field is set. - */ - @java.lang.Override - public boolean hasParentAbilityOverride() { - return parentAbilityOverride_ != null; - } + public static final int SERVER_BUFF_UID_FIELD_NUMBER = 12; + private int serverBuffUid_; /** - * .AbilityString parent_ability_override = 8; - * @return The parentAbilityOverride. + * uint32 server_buff_uid = 12; + * @return The serverBuffUid. */ @java.lang.Override - public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParentAbilityOverride() { - return parentAbilityOverride_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : parentAbilityOverride_; + public int getServerBuffUid() { + return serverBuffUid_; } + + public static final int APPLY_ENTITY_ID_FIELD_NUMBER = 13; + private int applyEntityId_; /** - * .AbilityString parent_ability_override = 8; + * uint32 apply_entity_id = 13; + * @return The applyEntityId. */ @java.lang.Override - public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityOverrideOrBuilder() { - return getParentAbilityOverride(); + public int getApplyEntityId() { + return applyEntityId_; } - public static final int MODIFIER_LOCAL_ID_FIELD_NUMBER = 14; - private int modifierLocalId_; + public static final int FCBFPCNFHLA_FIELD_NUMBER = 15; + private boolean fCBFPCNFHLA_; /** - * int32 modifier_local_id = 14; - * @return The modifierLocalId. + * bool FCBFPCNFHLA = 15; + * @return The fCBFPCNFHLA. */ @java.lang.Override - public int getModifierLocalId() { - return modifierLocalId_; + public boolean getFCBFPCNFHLA() { + return fCBFPCNFHLA_; } private byte memoizedIsInitialized = -1; @@ -522,38 +566,44 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (action_ != emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.MODIFIER_ACTION_ADDED.getNumber()) { - output.writeEnum(1, action_); + if (attachedInstancedModifier_ != null) { + output.writeMessage(1, getAttachedInstancedModifier()); + } + if (modifierLocalId_ != 0) { + output.writeInt32(2, modifierLocalId_); } if (isAttachedParentAbility_ != false) { - output.writeBool(2, isAttachedParentAbility_); + output.writeBool(3, isAttachedParentAbility_); } - if (serverBuffUid_ != 0) { - output.writeUInt32(5, serverBuffUid_); + if (eBAFPMJDPBC_ != 0L) { + output.writeUInt64(5, eBAFPMJDPBC_); } - for (int i = 0; i < properties_.size(); i++) { - output.writeMessage(6, properties_.get(i)); + if (lDJJJKNABGD_ != 0F) { + output.writeFloat(6, lDJJJKNABGD_); } - if (parentAbilityName_ != null) { - output.writeMessage(7, getParentAbilityName()); + if (action_ != emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.MODIFIER_ACTION_ADDED.getNumber()) { + output.writeEnum(7, action_); + } + if (iNGHBKHOLMO_ != false) { + output.writeBool(8, iNGHBKHOLMO_); } if (parentAbilityOverride_ != null) { - output.writeMessage(8, getParentAbilityOverride()); + output.writeMessage(9, getParentAbilityOverride()); } - if (applyEntityId_ != 0) { - output.writeUInt32(9, applyEntityId_); + for (int i = 0; i < properties_.size(); i++) { + output.writeMessage(10, properties_.get(i)); } - if (hEDGMMNKADC_ != false) { - output.writeBool(10, hEDGMMNKADC_); + if (parentAbilityName_ != null) { + output.writeMessage(11, getParentAbilityName()); } - if (bNMCKEBPDGI_ != false) { - output.writeBool(11, bNMCKEBPDGI_); + if (serverBuffUid_ != 0) { + output.writeUInt32(12, serverBuffUid_); } - if (modifierLocalId_ != 0) { - output.writeInt32(14, modifierLocalId_); + if (applyEntityId_ != 0) { + output.writeUInt32(13, applyEntityId_); } - if (attachedInstancedModifier_ != null) { - output.writeMessage(15, getAttachedInstancedModifier()); + if (fCBFPCNFHLA_ != false) { + output.writeBool(15, fCBFPCNFHLA_); } unknownFields.writeTo(output); } @@ -564,49 +614,57 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (action_ != emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.MODIFIER_ACTION_ADDED.getNumber()) { + if (attachedInstancedModifier_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getAttachedInstancedModifier()); + } + if (modifierLocalId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(1, action_); + .computeInt32Size(2, modifierLocalId_); } if (isAttachedParentAbility_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, isAttachedParentAbility_); + .computeBoolSize(3, isAttachedParentAbility_); } - if (serverBuffUid_ != 0) { + if (eBAFPMJDPBC_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, serverBuffUid_); + .computeUInt64Size(5, eBAFPMJDPBC_); } - for (int i = 0; i < properties_.size(); i++) { + if (lDJJJKNABGD_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, properties_.get(i)); + .computeFloatSize(6, lDJJJKNABGD_); } - if (parentAbilityName_ != null) { + if (action_ != emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.MODIFIER_ACTION_ADDED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(7, action_); + } + if (iNGHBKHOLMO_ != false) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, getParentAbilityName()); + .computeBoolSize(8, iNGHBKHOLMO_); } if (parentAbilityOverride_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, getParentAbilityOverride()); + .computeMessageSize(9, getParentAbilityOverride()); } - if (applyEntityId_ != 0) { + for (int i = 0; i < properties_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, applyEntityId_); + .computeMessageSize(10, properties_.get(i)); } - if (hEDGMMNKADC_ != false) { + if (parentAbilityName_ != null) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(10, hEDGMMNKADC_); + .computeMessageSize(11, getParentAbilityName()); } - if (bNMCKEBPDGI_ != false) { + if (serverBuffUid_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(11, bNMCKEBPDGI_); + .computeUInt32Size(12, serverBuffUid_); } - if (modifierLocalId_ != 0) { + if (applyEntityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(14, modifierLocalId_); + .computeUInt32Size(13, applyEntityId_); } - if (attachedInstancedModifier_ != null) { + if (fCBFPCNFHLA_ != false) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, getAttachedInstancedModifier()); + .computeBoolSize(15, fCBFPCNFHLA_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -628,31 +686,36 @@ public boolean equals(final java.lang.Object obj) { if (!getAttachedInstancedModifier() .equals(other.getAttachedInstancedModifier())) return false; } - if (getServerBuffUid() - != other.getServerBuffUid()) return false; - if (!getPropertiesList() - .equals(other.getPropertiesList())) return false; - if (getBNMCKEBPDGI() - != other.getBNMCKEBPDGI()) return false; + if (getModifierLocalId() + != other.getModifierLocalId()) return false; if (getIsAttachedParentAbility() != other.getIsAttachedParentAbility()) return false; - if (getApplyEntityId() - != other.getApplyEntityId()) return false; + if (getEBAFPMJDPBC() + != other.getEBAFPMJDPBC()) return false; + if (java.lang.Float.floatToIntBits(getLDJJJKNABGD()) + != java.lang.Float.floatToIntBits( + other.getLDJJJKNABGD())) return false; if (action_ != other.action_) return false; - if (getHEDGMMNKADC() - != other.getHEDGMMNKADC()) return false; - if (hasParentAbilityName() != other.hasParentAbilityName()) return false; - if (hasParentAbilityName()) { - if (!getParentAbilityName() - .equals(other.getParentAbilityName())) return false; - } + if (getINGHBKHOLMO() + != other.getINGHBKHOLMO()) return false; if (hasParentAbilityOverride() != other.hasParentAbilityOverride()) return false; if (hasParentAbilityOverride()) { if (!getParentAbilityOverride() .equals(other.getParentAbilityOverride())) return false; } - if (getModifierLocalId() - != other.getModifierLocalId()) return false; + if (!getPropertiesList() + .equals(other.getPropertiesList())) return false; + if (hasParentAbilityName() != other.hasParentAbilityName()) return false; + if (hasParentAbilityName()) { + if (!getParentAbilityName() + .equals(other.getParentAbilityName())) return false; + } + if (getServerBuffUid() + != other.getServerBuffUid()) return false; + if (getApplyEntityId() + != other.getApplyEntityId()) return false; + if (getFCBFPCNFHLA() + != other.getFCBFPCNFHLA()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -668,35 +731,41 @@ public int hashCode() { hash = (37 * hash) + ATTACHED_INSTANCED_MODIFIER_FIELD_NUMBER; hash = (53 * hash) + getAttachedInstancedModifier().hashCode(); } - hash = (37 * hash) + SERVER_BUFF_UID_FIELD_NUMBER; - hash = (53 * hash) + getServerBuffUid(); - if (getPropertiesCount() > 0) { - hash = (37 * hash) + PROPERTIES_FIELD_NUMBER; - hash = (53 * hash) + getPropertiesList().hashCode(); - } - hash = (37 * hash) + BNMCKEBPDGI_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getBNMCKEBPDGI()); + hash = (37 * hash) + MODIFIER_LOCAL_ID_FIELD_NUMBER; + hash = (53 * hash) + getModifierLocalId(); hash = (37 * hash) + IS_ATTACHED_PARENT_ABILITY_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsAttachedParentAbility()); - hash = (37 * hash) + APPLY_ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getApplyEntityId(); + hash = (37 * hash) + EBAFPMJDPBC_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getEBAFPMJDPBC()); + hash = (37 * hash) + LDJJJKNABGD_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getLDJJJKNABGD()); hash = (37 * hash) + ACTION_FIELD_NUMBER; hash = (53 * hash) + action_; - hash = (37 * hash) + HEDGMMNKADC_FIELD_NUMBER; + hash = (37 * hash) + INGHBKHOLMO_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getHEDGMMNKADC()); - if (hasParentAbilityName()) { - hash = (37 * hash) + PARENT_ABILITY_NAME_FIELD_NUMBER; - hash = (53 * hash) + getParentAbilityName().hashCode(); - } + getINGHBKHOLMO()); if (hasParentAbilityOverride()) { hash = (37 * hash) + PARENT_ABILITY_OVERRIDE_FIELD_NUMBER; hash = (53 * hash) + getParentAbilityOverride().hashCode(); } - hash = (37 * hash) + MODIFIER_LOCAL_ID_FIELD_NUMBER; - hash = (53 * hash) + getModifierLocalId(); + if (getPropertiesCount() > 0) { + hash = (37 * hash) + PROPERTIES_FIELD_NUMBER; + hash = (53 * hash) + getPropertiesList().hashCode(); + } + if (hasParentAbilityName()) { + hash = (37 * hash) + PARENT_ABILITY_NAME_FIELD_NUMBER; + hash = (53 * hash) + getParentAbilityName().hashCode(); + } + hash = (37 * hash) + SERVER_BUFF_UID_FIELD_NUMBER; + hash = (53 * hash) + getServerBuffUid(); + hash = (37 * hash) + APPLY_ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getApplyEntityId(); + hash = (37 * hash) + FCBFPCNFHLA_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getFCBFPCNFHLA()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -794,7 +863,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: FFBMKELHDNF
+     * obf: EKODCPMLOAJ
      *
* * Protobuf type {@code AbilityMetaModifierChange} @@ -841,37 +910,41 @@ public Builder clear() { attachedInstancedModifier_ = null; attachedInstancedModifierBuilder_ = null; } - serverBuffUid_ = 0; - - if (propertiesBuilder_ == null) { - properties_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - propertiesBuilder_.clear(); - } - bNMCKEBPDGI_ = false; + modifierLocalId_ = 0; isAttachedParentAbility_ = false; - applyEntityId_ = 0; + eBAFPMJDPBC_ = 0L; + + lDJJJKNABGD_ = 0F; action_ = 0; - hEDGMMNKADC_ = false; + iNGHBKHOLMO_ = false; - if (parentAbilityNameBuilder_ == null) { - parentAbilityName_ = null; - } else { - parentAbilityName_ = null; - parentAbilityNameBuilder_ = null; - } if (parentAbilityOverrideBuilder_ == null) { parentAbilityOverride_ = null; } else { parentAbilityOverride_ = null; parentAbilityOverrideBuilder_ = null; } - modifierLocalId_ = 0; + if (propertiesBuilder_ == null) { + properties_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + propertiesBuilder_.clear(); + } + if (parentAbilityNameBuilder_ == null) { + parentAbilityName_ = null; + } else { + parentAbilityName_ = null; + parentAbilityNameBuilder_ = null; + } + serverBuffUid_ = 0; + + applyEntityId_ = 0; + + fCBFPCNFHLA_ = false; return this; } @@ -905,7 +978,17 @@ public emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMeta } else { result.attachedInstancedModifier_ = attachedInstancedModifierBuilder_.build(); } - result.serverBuffUid_ = serverBuffUid_; + result.modifierLocalId_ = modifierLocalId_; + result.isAttachedParentAbility_ = isAttachedParentAbility_; + result.eBAFPMJDPBC_ = eBAFPMJDPBC_; + result.lDJJJKNABGD_ = lDJJJKNABGD_; + result.action_ = action_; + result.iNGHBKHOLMO_ = iNGHBKHOLMO_; + if (parentAbilityOverrideBuilder_ == null) { + result.parentAbilityOverride_ = parentAbilityOverride_; + } else { + result.parentAbilityOverride_ = parentAbilityOverrideBuilder_.build(); + } if (propertiesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { properties_ = java.util.Collections.unmodifiableList(properties_); @@ -915,22 +998,14 @@ public emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMeta } else { result.properties_ = propertiesBuilder_.build(); } - result.bNMCKEBPDGI_ = bNMCKEBPDGI_; - result.isAttachedParentAbility_ = isAttachedParentAbility_; - result.applyEntityId_ = applyEntityId_; - result.action_ = action_; - result.hEDGMMNKADC_ = hEDGMMNKADC_; if (parentAbilityNameBuilder_ == null) { result.parentAbilityName_ = parentAbilityName_; } else { result.parentAbilityName_ = parentAbilityNameBuilder_.build(); } - if (parentAbilityOverrideBuilder_ == null) { - result.parentAbilityOverride_ = parentAbilityOverride_; - } else { - result.parentAbilityOverride_ = parentAbilityOverrideBuilder_.build(); - } - result.modifierLocalId_ = modifierLocalId_; + result.serverBuffUid_ = serverBuffUid_; + result.applyEntityId_ = applyEntityId_; + result.fCBFPCNFHLA_ = fCBFPCNFHLA_; onBuilt(); return result; } @@ -982,8 +1057,26 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AbilityMetaModifierChangeOute if (other.hasAttachedInstancedModifier()) { mergeAttachedInstancedModifier(other.getAttachedInstancedModifier()); } - if (other.getServerBuffUid() != 0) { - setServerBuffUid(other.getServerBuffUid()); + if (other.getModifierLocalId() != 0) { + setModifierLocalId(other.getModifierLocalId()); + } + if (other.getIsAttachedParentAbility() != false) { + setIsAttachedParentAbility(other.getIsAttachedParentAbility()); + } + if (other.getEBAFPMJDPBC() != 0L) { + setEBAFPMJDPBC(other.getEBAFPMJDPBC()); + } + if (other.getLDJJJKNABGD() != 0F) { + setLDJJJKNABGD(other.getLDJJJKNABGD()); + } + if (other.action_ != 0) { + setActionValue(other.getActionValue()); + } + if (other.getINGHBKHOLMO() != false) { + setINGHBKHOLMO(other.getINGHBKHOLMO()); + } + if (other.hasParentAbilityOverride()) { + mergeParentAbilityOverride(other.getParentAbilityOverride()); } if (propertiesBuilder_ == null) { if (!other.properties_.isEmpty()) { @@ -1011,29 +1104,17 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AbilityMetaModifierChangeOute } } } - if (other.getBNMCKEBPDGI() != false) { - setBNMCKEBPDGI(other.getBNMCKEBPDGI()); + if (other.hasParentAbilityName()) { + mergeParentAbilityName(other.getParentAbilityName()); } - if (other.getIsAttachedParentAbility() != false) { - setIsAttachedParentAbility(other.getIsAttachedParentAbility()); + if (other.getServerBuffUid() != 0) { + setServerBuffUid(other.getServerBuffUid()); } if (other.getApplyEntityId() != 0) { setApplyEntityId(other.getApplyEntityId()); } - if (other.action_ != 0) { - setActionValue(other.getActionValue()); - } - if (other.getHEDGMMNKADC() != false) { - setHEDGMMNKADC(other.getHEDGMMNKADC()); - } - if (other.hasParentAbilityName()) { - mergeParentAbilityName(other.getParentAbilityName()); - } - if (other.hasParentAbilityOverride()) { - mergeParentAbilityOverride(other.getParentAbilityOverride()); - } - if (other.getModifierLocalId() != 0) { - setModifierLocalId(other.getModifierLocalId()); + if (other.getFCBFPCNFHLA() != false) { + setFCBFPCNFHLA(other.getFCBFPCNFHLA()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1069,14 +1150,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier, emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.Builder, emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifierOrBuilder> attachedInstancedModifierBuilder_; /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; * @return Whether the attachedInstancedModifier field is set. */ public boolean hasAttachedInstancedModifier() { return attachedInstancedModifierBuilder_ != null || attachedInstancedModifier_ != null; } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; * @return The attachedInstancedModifier. */ public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier getAttachedInstancedModifier() { @@ -1087,7 +1168,7 @@ public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttach } } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ public Builder setAttachedInstancedModifier(emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier value) { if (attachedInstancedModifierBuilder_ == null) { @@ -1103,7 +1184,7 @@ public Builder setAttachedInstancedModifier(emu.grasscutter.net.proto.AbilityAtt return this; } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ public Builder setAttachedInstancedModifier( emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.Builder builderForValue) { @@ -1117,7 +1198,7 @@ public Builder setAttachedInstancedModifier( return this; } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ public Builder mergeAttachedInstancedModifier(emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier value) { if (attachedInstancedModifierBuilder_ == null) { @@ -1135,7 +1216,7 @@ public Builder mergeAttachedInstancedModifier(emu.grasscutter.net.proto.AbilityA return this; } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ public Builder clearAttachedInstancedModifier() { if (attachedInstancedModifierBuilder_ == null) { @@ -1149,7 +1230,7 @@ public Builder clearAttachedInstancedModifier() { return this; } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.Builder getAttachedInstancedModifierBuilder() { @@ -1157,7 +1238,7 @@ public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttach return getAttachedInstancedModifierFieldBuilder().getBuilder(); } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifierOrBuilder getAttachedInstancedModifierOrBuilder() { if (attachedInstancedModifierBuilder_ != null) { @@ -1168,7 +1249,7 @@ public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttach } } /** - * .AbilityAttachedModifier attached_instanced_modifier = 15; + * .AbilityAttachedModifier attached_instanced_modifier = 1; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier, emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifier.Builder, emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttachedModifierOrBuilder> @@ -1184,467 +1265,586 @@ public emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.AbilityAttach return attachedInstancedModifierBuilder_; } - private int serverBuffUid_ ; + private int modifierLocalId_ ; /** - * uint32 server_buff_uid = 5; - * @return The serverBuffUid. + * int32 modifier_local_id = 2; + * @return The modifierLocalId. */ @java.lang.Override - public int getServerBuffUid() { - return serverBuffUid_; + public int getModifierLocalId() { + return modifierLocalId_; } /** - * uint32 server_buff_uid = 5; - * @param value The serverBuffUid to set. + * int32 modifier_local_id = 2; + * @param value The modifierLocalId to set. * @return This builder for chaining. */ - public Builder setServerBuffUid(int value) { + public Builder setModifierLocalId(int value) { - serverBuffUid_ = value; + modifierLocalId_ = value; onChanged(); return this; } /** - * uint32 server_buff_uid = 5; + * int32 modifier_local_id = 2; * @return This builder for chaining. */ - public Builder clearServerBuffUid() { + public Builder clearModifierLocalId() { - serverBuffUid_ = 0; + modifierLocalId_ = 0; onChanged(); return this; } - private java.util.List properties_ = - java.util.Collections.emptyList(); - private void ensurePropertiesIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - properties_ = new java.util.ArrayList(properties_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder> propertiesBuilder_; - + private boolean isAttachedParentAbility_ ; /** - * repeated .ModifierProperty properties = 6; + * bool is_attached_parent_ability = 3; + * @return The isAttachedParentAbility. */ - public java.util.List getPropertiesList() { - if (propertiesBuilder_ == null) { - return java.util.Collections.unmodifiableList(properties_); - } else { - return propertiesBuilder_.getMessageList(); - } + @java.lang.Override + public boolean getIsAttachedParentAbility() { + return isAttachedParentAbility_; } /** - * repeated .ModifierProperty properties = 6; + * bool is_attached_parent_ability = 3; + * @param value The isAttachedParentAbility to set. + * @return This builder for chaining. */ - public int getPropertiesCount() { - if (propertiesBuilder_ == null) { - return properties_.size(); - } else { - return propertiesBuilder_.getCount(); - } + public Builder setIsAttachedParentAbility(boolean value) { + + isAttachedParentAbility_ = value; + onChanged(); + return this; } /** - * repeated .ModifierProperty properties = 6; + * bool is_attached_parent_ability = 3; + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty getProperties(int index) { - if (propertiesBuilder_ == null) { - return properties_.get(index); - } else { - return propertiesBuilder_.getMessage(index); - } + public Builder clearIsAttachedParentAbility() { + + isAttachedParentAbility_ = false; + onChanged(); + return this; } + + private long eBAFPMJDPBC_ ; /** - * repeated .ModifierProperty properties = 6; + * uint64 EBAFPMJDPBC = 5; + * @return The eBAFPMJDPBC. */ - public Builder setProperties( - int index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty value) { - if (propertiesBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensurePropertiesIsMutable(); - properties_.set(index, value); - onChanged(); - } else { - propertiesBuilder_.setMessage(index, value); - } - return this; + @java.lang.Override + public long getEBAFPMJDPBC() { + return eBAFPMJDPBC_; } /** - * repeated .ModifierProperty properties = 6; + * uint64 EBAFPMJDPBC = 5; + * @param value The eBAFPMJDPBC to set. + * @return This builder for chaining. */ - public Builder setProperties( - int index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder builderForValue) { - if (propertiesBuilder_ == null) { - ensurePropertiesIsMutable(); - properties_.set(index, builderForValue.build()); - onChanged(); - } else { - propertiesBuilder_.setMessage(index, builderForValue.build()); - } + public Builder setEBAFPMJDPBC(long value) { + + eBAFPMJDPBC_ = value; + onChanged(); return this; } /** - * repeated .ModifierProperty properties = 6; + * uint64 EBAFPMJDPBC = 5; + * @return This builder for chaining. */ - public Builder addProperties(emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty value) { - if (propertiesBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensurePropertiesIsMutable(); - properties_.add(value); - onChanged(); - } else { - propertiesBuilder_.addMessage(value); - } + public Builder clearEBAFPMJDPBC() { + + eBAFPMJDPBC_ = 0L; + onChanged(); return this; } + + private float lDJJJKNABGD_ ; /** - * repeated .ModifierProperty properties = 6; + * float LDJJJKNABGD = 6; + * @return The lDJJJKNABGD. */ - public Builder addProperties( - int index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty value) { - if (propertiesBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensurePropertiesIsMutable(); - properties_.add(index, value); - onChanged(); - } else { - propertiesBuilder_.addMessage(index, value); - } + @java.lang.Override + public float getLDJJJKNABGD() { + return lDJJJKNABGD_; + } + /** + * float LDJJJKNABGD = 6; + * @param value The lDJJJKNABGD to set. + * @return This builder for chaining. + */ + public Builder setLDJJJKNABGD(float value) { + + lDJJJKNABGD_ = value; + onChanged(); return this; } /** - * repeated .ModifierProperty properties = 6; + * float LDJJJKNABGD = 6; + * @return This builder for chaining. */ - public Builder addProperties( - emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder builderForValue) { - if (propertiesBuilder_ == null) { - ensurePropertiesIsMutable(); - properties_.add(builderForValue.build()); - onChanged(); - } else { - propertiesBuilder_.addMessage(builderForValue.build()); - } + public Builder clearLDJJJKNABGD() { + + lDJJJKNABGD_ = 0F; + onChanged(); return this; } + + private int action_ = 0; /** - * repeated .ModifierProperty properties = 6; + * .ModifierAction action = 7; + * @return The enum numeric value on the wire for action. */ - public Builder addProperties( - int index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder builderForValue) { - if (propertiesBuilder_ == null) { - ensurePropertiesIsMutable(); - properties_.add(index, builderForValue.build()); - onChanged(); - } else { - propertiesBuilder_.addMessage(index, builderForValue.build()); - } + @java.lang.Override public int getActionValue() { + return action_; + } + /** + * .ModifierAction action = 7; + * @param value The enum numeric value on the wire for action to set. + * @return This builder for chaining. + */ + public Builder setActionValue(int value) { + + action_ = value; + onChanged(); return this; } /** - * repeated .ModifierProperty properties = 6; + * .ModifierAction action = 7; + * @return The action. */ - public Builder addAllProperties( - java.lang.Iterable values) { - if (propertiesBuilder_ == null) { - ensurePropertiesIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, properties_); - onChanged(); - } else { - propertiesBuilder_.addAllMessages(values); + @java.lang.Override + public emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction getAction() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction result = emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.valueOf(action_); + return result == null ? emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.UNRECOGNIZED : result; + } + /** + * .ModifierAction action = 7; + * @param value The action to set. + * @return This builder for chaining. + */ + public Builder setAction(emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction value) { + if (value == null) { + throw new NullPointerException(); } + + action_ = value.getNumber(); + onChanged(); return this; } /** - * repeated .ModifierProperty properties = 6; + * .ModifierAction action = 7; + * @return This builder for chaining. */ - public Builder clearProperties() { - if (propertiesBuilder_ == null) { - properties_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); + public Builder clearAction() { + + action_ = 0; + onChanged(); + return this; + } + + private boolean iNGHBKHOLMO_ ; + /** + * bool INGHBKHOLMO = 8; + * @return The iNGHBKHOLMO. + */ + @java.lang.Override + public boolean getINGHBKHOLMO() { + return iNGHBKHOLMO_; + } + /** + * bool INGHBKHOLMO = 8; + * @param value The iNGHBKHOLMO to set. + * @return This builder for chaining. + */ + public Builder setINGHBKHOLMO(boolean value) { + + iNGHBKHOLMO_ = value; + onChanged(); + return this; + } + /** + * bool INGHBKHOLMO = 8; + * @return This builder for chaining. + */ + public Builder clearINGHBKHOLMO() { + + iNGHBKHOLMO_ = false; + onChanged(); + return this; + } + + private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString parentAbilityOverride_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> parentAbilityOverrideBuilder_; + /** + * .AbilityString parent_ability_override = 9; + * @return Whether the parentAbilityOverride field is set. + */ + public boolean hasParentAbilityOverride() { + return parentAbilityOverrideBuilder_ != null || parentAbilityOverride_ != null; + } + /** + * .AbilityString parent_ability_override = 9; + * @return The parentAbilityOverride. + */ + public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParentAbilityOverride() { + if (parentAbilityOverrideBuilder_ == null) { + return parentAbilityOverride_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : parentAbilityOverride_; } else { - propertiesBuilder_.clear(); + return parentAbilityOverrideBuilder_.getMessage(); } - return this; } /** - * repeated .ModifierProperty properties = 6; + * .AbilityString parent_ability_override = 9; */ - public Builder removeProperties(int index) { - if (propertiesBuilder_ == null) { - ensurePropertiesIsMutable(); - properties_.remove(index); + public Builder setParentAbilityOverride(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) { + if (parentAbilityOverrideBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + parentAbilityOverride_ = value; onChanged(); } else { - propertiesBuilder_.remove(index); + parentAbilityOverrideBuilder_.setMessage(value); } + return this; } /** - * repeated .ModifierProperty properties = 6; + * .AbilityString parent_ability_override = 9; */ - public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder getPropertiesBuilder( - int index) { - return getPropertiesFieldBuilder().getBuilder(index); + public Builder setParentAbilityOverride( + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder builderForValue) { + if (parentAbilityOverrideBuilder_ == null) { + parentAbilityOverride_ = builderForValue.build(); + onChanged(); + } else { + parentAbilityOverrideBuilder_.setMessage(builderForValue.build()); + } + + return this; } /** - * repeated .ModifierProperty properties = 6; + * .AbilityString parent_ability_override = 9; */ - public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder getPropertiesOrBuilder( - int index) { - if (propertiesBuilder_ == null) { - return properties_.get(index); } else { - return propertiesBuilder_.getMessageOrBuilder(index); + public Builder mergeParentAbilityOverride(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) { + if (parentAbilityOverrideBuilder_ == null) { + if (parentAbilityOverride_ != null) { + parentAbilityOverride_ = + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.newBuilder(parentAbilityOverride_).mergeFrom(value).buildPartial(); + } else { + parentAbilityOverride_ = value; + } + onChanged(); + } else { + parentAbilityOverrideBuilder_.mergeFrom(value); } + + return this; } /** - * repeated .ModifierProperty properties = 6; + * .AbilityString parent_ability_override = 9; */ - public java.util.List - getPropertiesOrBuilderList() { - if (propertiesBuilder_ != null) { - return propertiesBuilder_.getMessageOrBuilderList(); + public Builder clearParentAbilityOverride() { + if (parentAbilityOverrideBuilder_ == null) { + parentAbilityOverride_ = null; + onChanged(); } else { - return java.util.Collections.unmodifiableList(properties_); + parentAbilityOverride_ = null; + parentAbilityOverrideBuilder_ = null; } + + return this; } /** - * repeated .ModifierProperty properties = 6; + * .AbilityString parent_ability_override = 9; */ - public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder addPropertiesBuilder() { - return getPropertiesFieldBuilder().addBuilder( - emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.getDefaultInstance()); + public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder getParentAbilityOverrideBuilder() { + + onChanged(); + return getParentAbilityOverrideFieldBuilder().getBuilder(); } /** - * repeated .ModifierProperty properties = 6; + * .AbilityString parent_ability_override = 9; */ - public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder addPropertiesBuilder( - int index) { - return getPropertiesFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.getDefaultInstance()); + public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityOverrideOrBuilder() { + if (parentAbilityOverrideBuilder_ != null) { + return parentAbilityOverrideBuilder_.getMessageOrBuilder(); + } else { + return parentAbilityOverride_ == null ? + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : parentAbilityOverride_; + } } /** - * repeated .ModifierProperty properties = 6; + * .AbilityString parent_ability_override = 9; */ - public java.util.List - getPropertiesBuilderList() { - return getPropertiesFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder> - getPropertiesFieldBuilder() { - if (propertiesBuilder_ == null) { - propertiesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder>( - properties_, - ((bitField0_ & 0x00000001) != 0), + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> + getParentAbilityOverrideFieldBuilder() { + if (parentAbilityOverrideBuilder_ == null) { + parentAbilityOverrideBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder>( + getParentAbilityOverride(), getParentForChildren(), isClean()); - properties_ = null; + parentAbilityOverride_ = null; } - return propertiesBuilder_; + return parentAbilityOverrideBuilder_; } - private boolean bNMCKEBPDGI_ ; + private java.util.List properties_ = + java.util.Collections.emptyList(); + private void ensurePropertiesIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + properties_ = new java.util.ArrayList(properties_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder> propertiesBuilder_; + /** - * bool BNMCKEBPDGI = 11; - * @return The bNMCKEBPDGI. + * repeated .ModifierProperty properties = 10; */ - @java.lang.Override - public boolean getBNMCKEBPDGI() { - return bNMCKEBPDGI_; + public java.util.List getPropertiesList() { + if (propertiesBuilder_ == null) { + return java.util.Collections.unmodifiableList(properties_); + } else { + return propertiesBuilder_.getMessageList(); + } } /** - * bool BNMCKEBPDGI = 11; - * @param value The bNMCKEBPDGI to set. - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder setBNMCKEBPDGI(boolean value) { - - bNMCKEBPDGI_ = value; - onChanged(); - return this; + public int getPropertiesCount() { + if (propertiesBuilder_ == null) { + return properties_.size(); + } else { + return propertiesBuilder_.getCount(); + } } /** - * bool BNMCKEBPDGI = 11; - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder clearBNMCKEBPDGI() { - - bNMCKEBPDGI_ = false; - onChanged(); - return this; + public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty getProperties(int index) { + if (propertiesBuilder_ == null) { + return properties_.get(index); + } else { + return propertiesBuilder_.getMessage(index); + } } - - private boolean isAttachedParentAbility_ ; /** - * bool is_attached_parent_ability = 2; - * @return The isAttachedParentAbility. + * repeated .ModifierProperty properties = 10; */ - @java.lang.Override - public boolean getIsAttachedParentAbility() { - return isAttachedParentAbility_; + public Builder setProperties( + int index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty value) { + if (propertiesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertiesIsMutable(); + properties_.set(index, value); + onChanged(); + } else { + propertiesBuilder_.setMessage(index, value); + } + return this; } /** - * bool is_attached_parent_ability = 2; - * @param value The isAttachedParentAbility to set. - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder setIsAttachedParentAbility(boolean value) { - - isAttachedParentAbility_ = value; - onChanged(); + public Builder setProperties( + int index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder builderForValue) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.set(index, builderForValue.build()); + onChanged(); + } else { + propertiesBuilder_.setMessage(index, builderForValue.build()); + } return this; } /** - * bool is_attached_parent_ability = 2; - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder clearIsAttachedParentAbility() { - - isAttachedParentAbility_ = false; - onChanged(); + public Builder addProperties(emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty value) { + if (propertiesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertiesIsMutable(); + properties_.add(value); + onChanged(); + } else { + propertiesBuilder_.addMessage(value); + } return this; } - - private int applyEntityId_ ; /** - * uint32 apply_entity_id = 9; - * @return The applyEntityId. + * repeated .ModifierProperty properties = 10; */ - @java.lang.Override - public int getApplyEntityId() { - return applyEntityId_; + public Builder addProperties( + int index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty value) { + if (propertiesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensurePropertiesIsMutable(); + properties_.add(index, value); + onChanged(); + } else { + propertiesBuilder_.addMessage(index, value); + } + return this; } /** - * uint32 apply_entity_id = 9; - * @param value The applyEntityId to set. - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder setApplyEntityId(int value) { - - applyEntityId_ = value; - onChanged(); + public Builder addProperties( + emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder builderForValue) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.add(builderForValue.build()); + onChanged(); + } else { + propertiesBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .ModifierProperty properties = 10; + */ + public Builder addProperties( + int index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder builderForValue) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.add(index, builderForValue.build()); + onChanged(); + } else { + propertiesBuilder_.addMessage(index, builderForValue.build()); + } return this; } /** - * uint32 apply_entity_id = 9; - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder clearApplyEntityId() { - - applyEntityId_ = 0; - onChanged(); + public Builder addAllProperties( + java.lang.Iterable values) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, properties_); + onChanged(); + } else { + propertiesBuilder_.addAllMessages(values); + } return this; } - - private int action_ = 0; /** - * .ModifierAction action = 1; - * @return The enum numeric value on the wire for action. + * repeated .ModifierProperty properties = 10; */ - @java.lang.Override public int getActionValue() { - return action_; + public Builder clearProperties() { + if (propertiesBuilder_ == null) { + properties_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + propertiesBuilder_.clear(); + } + return this; } /** - * .ModifierAction action = 1; - * @param value The enum numeric value on the wire for action to set. - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder setActionValue(int value) { - - action_ = value; - onChanged(); + public Builder removeProperties(int index) { + if (propertiesBuilder_ == null) { + ensurePropertiesIsMutable(); + properties_.remove(index); + onChanged(); + } else { + propertiesBuilder_.remove(index); + } return this; } /** - * .ModifierAction action = 1; - * @return The action. + * repeated .ModifierProperty properties = 10; */ - @java.lang.Override - public emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction getAction() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction result = emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.valueOf(action_); - return result == null ? emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction.UNRECOGNIZED : result; + public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder getPropertiesBuilder( + int index) { + return getPropertiesFieldBuilder().getBuilder(index); } /** - * .ModifierAction action = 1; - * @param value The action to set. - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder setAction(emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction value) { - if (value == null) { - throw new NullPointerException(); + public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder getPropertiesOrBuilder( + int index) { + if (propertiesBuilder_ == null) { + return properties_.get(index); } else { + return propertiesBuilder_.getMessageOrBuilder(index); } - - action_ = value.getNumber(); - onChanged(); - return this; } /** - * .ModifierAction action = 1; - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder clearAction() { - - action_ = 0; - onChanged(); - return this; + public java.util.List + getPropertiesOrBuilderList() { + if (propertiesBuilder_ != null) { + return propertiesBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(properties_); + } } - - private boolean hEDGMMNKADC_ ; /** - * bool HEDGMMNKADC = 10; - * @return The hEDGMMNKADC. + * repeated .ModifierProperty properties = 10; */ - @java.lang.Override - public boolean getHEDGMMNKADC() { - return hEDGMMNKADC_; + public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder addPropertiesBuilder() { + return getPropertiesFieldBuilder().addBuilder( + emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.getDefaultInstance()); } /** - * bool HEDGMMNKADC = 10; - * @param value The hEDGMMNKADC to set. - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder setHEDGMMNKADC(boolean value) { - - hEDGMMNKADC_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder addPropertiesBuilder( + int index) { + return getPropertiesFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.getDefaultInstance()); } /** - * bool HEDGMMNKADC = 10; - * @return This builder for chaining. + * repeated .ModifierProperty properties = 10; */ - public Builder clearHEDGMMNKADC() { - - hEDGMMNKADC_ = false; - onChanged(); - return this; + public java.util.List + getPropertiesBuilderList() { + return getPropertiesFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder> + getPropertiesFieldBuilder() { + if (propertiesBuilder_ == null) { + propertiesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierPropertyOrBuilder>( + properties_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + properties_ = null; + } + return propertiesBuilder_; } private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString parentAbilityName_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> parentAbilityNameBuilder_; /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; * @return Whether the parentAbilityName field is set. */ public boolean hasParentAbilityName() { return parentAbilityNameBuilder_ != null || parentAbilityName_ != null; } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; * @return The parentAbilityName. */ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParentAbilityName() { @@ -1655,7 +1855,7 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParent } } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ public Builder setParentAbilityName(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) { if (parentAbilityNameBuilder_ == null) { @@ -1671,7 +1871,7 @@ public Builder setParentAbilityName(emu.grasscutter.net.proto.AbilityStringOuter return this; } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ public Builder setParentAbilityName( emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder builderForValue) { @@ -1685,7 +1885,7 @@ public Builder setParentAbilityName( return this; } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ public Builder mergeParentAbilityName(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) { if (parentAbilityNameBuilder_ == null) { @@ -1703,7 +1903,7 @@ public Builder mergeParentAbilityName(emu.grasscutter.net.proto.AbilityStringOut return this; } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ public Builder clearParentAbilityName() { if (parentAbilityNameBuilder_ == null) { @@ -1717,7 +1917,7 @@ public Builder clearParentAbilityName() { return this; } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder getParentAbilityNameBuilder() { @@ -1725,7 +1925,7 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder g return getParentAbilityNameFieldBuilder().getBuilder(); } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityNameOrBuilder() { if (parentAbilityNameBuilder_ != null) { @@ -1736,7 +1936,7 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder } } /** - * .AbilityString parent_ability_name = 7; + * .AbilityString parent_ability_name = 11; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> @@ -1752,152 +1952,95 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder return parentAbilityNameBuilder_; } - private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString parentAbilityOverride_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> parentAbilityOverrideBuilder_; - /** - * .AbilityString parent_ability_override = 8; - * @return Whether the parentAbilityOverride field is set. - */ - public boolean hasParentAbilityOverride() { - return parentAbilityOverrideBuilder_ != null || parentAbilityOverride_ != null; - } + private int serverBuffUid_ ; /** - * .AbilityString parent_ability_override = 8; - * @return The parentAbilityOverride. + * uint32 server_buff_uid = 12; + * @return The serverBuffUid. */ - public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getParentAbilityOverride() { - if (parentAbilityOverrideBuilder_ == null) { - return parentAbilityOverride_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : parentAbilityOverride_; - } else { - return parentAbilityOverrideBuilder_.getMessage(); - } + @java.lang.Override + public int getServerBuffUid() { + return serverBuffUid_; } /** - * .AbilityString parent_ability_override = 8; + * uint32 server_buff_uid = 12; + * @param value The serverBuffUid to set. + * @return This builder for chaining. */ - public Builder setParentAbilityOverride(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) { - if (parentAbilityOverrideBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - parentAbilityOverride_ = value; - onChanged(); - } else { - parentAbilityOverrideBuilder_.setMessage(value); - } - + public Builder setServerBuffUid(int value) { + + serverBuffUid_ = value; + onChanged(); return this; } /** - * .AbilityString parent_ability_override = 8; + * uint32 server_buff_uid = 12; + * @return This builder for chaining. */ - public Builder setParentAbilityOverride( - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder builderForValue) { - if (parentAbilityOverrideBuilder_ == null) { - parentAbilityOverride_ = builderForValue.build(); - onChanged(); - } else { - parentAbilityOverrideBuilder_.setMessage(builderForValue.build()); - } - + public Builder clearServerBuffUid() { + + serverBuffUid_ = 0; + onChanged(); return this; } - /** - * .AbilityString parent_ability_override = 8; - */ - public Builder mergeParentAbilityOverride(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) { - if (parentAbilityOverrideBuilder_ == null) { - if (parentAbilityOverride_ != null) { - parentAbilityOverride_ = - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.newBuilder(parentAbilityOverride_).mergeFrom(value).buildPartial(); - } else { - parentAbilityOverride_ = value; - } - onChanged(); - } else { - parentAbilityOverrideBuilder_.mergeFrom(value); - } - return this; - } + private int applyEntityId_ ; /** - * .AbilityString parent_ability_override = 8; + * uint32 apply_entity_id = 13; + * @return The applyEntityId. */ - public Builder clearParentAbilityOverride() { - if (parentAbilityOverrideBuilder_ == null) { - parentAbilityOverride_ = null; - onChanged(); - } else { - parentAbilityOverride_ = null; - parentAbilityOverrideBuilder_ = null; - } - - return this; + @java.lang.Override + public int getApplyEntityId() { + return applyEntityId_; } /** - * .AbilityString parent_ability_override = 8; + * uint32 apply_entity_id = 13; + * @param value The applyEntityId to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder getParentAbilityOverrideBuilder() { + public Builder setApplyEntityId(int value) { + applyEntityId_ = value; onChanged(); - return getParentAbilityOverrideFieldBuilder().getBuilder(); - } - /** - * .AbilityString parent_ability_override = 8; - */ - public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getParentAbilityOverrideOrBuilder() { - if (parentAbilityOverrideBuilder_ != null) { - return parentAbilityOverrideBuilder_.getMessageOrBuilder(); - } else { - return parentAbilityOverride_ == null ? - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : parentAbilityOverride_; - } + return this; } /** - * .AbilityString parent_ability_override = 8; + * uint32 apply_entity_id = 13; + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> - getParentAbilityOverrideFieldBuilder() { - if (parentAbilityOverrideBuilder_ == null) { - parentAbilityOverrideBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder>( - getParentAbilityOverride(), - getParentForChildren(), - isClean()); - parentAbilityOverride_ = null; - } - return parentAbilityOverrideBuilder_; + public Builder clearApplyEntityId() { + + applyEntityId_ = 0; + onChanged(); + return this; } - private int modifierLocalId_ ; + private boolean fCBFPCNFHLA_ ; /** - * int32 modifier_local_id = 14; - * @return The modifierLocalId. + * bool FCBFPCNFHLA = 15; + * @return The fCBFPCNFHLA. */ @java.lang.Override - public int getModifierLocalId() { - return modifierLocalId_; + public boolean getFCBFPCNFHLA() { + return fCBFPCNFHLA_; } /** - * int32 modifier_local_id = 14; - * @param value The modifierLocalId to set. + * bool FCBFPCNFHLA = 15; + * @param value The fCBFPCNFHLA to set. * @return This builder for chaining. */ - public Builder setModifierLocalId(int value) { + public Builder setFCBFPCNFHLA(boolean value) { - modifierLocalId_ = value; + fCBFPCNFHLA_ = value; onChanged(); return this; } /** - * int32 modifier_local_id = 14; + * bool FCBFPCNFHLA = 15; * @return This builder for chaining. */ - public Builder clearModifierLocalId() { + public Builder clearFCBFPCNFHLA() { - modifierLocalId_ = 0; + fCBFPCNFHLA_ = false; onChanged(); return this; } @@ -1969,39 +2112,40 @@ public emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMeta static { java.lang.String[] descriptorData = { "\n\037AbilityMetaModifierChange.proto\032\035Abili" + - "tyAttachedModifier.proto\032\026ModifierProper" + - "ty.proto\032\024ModifierAction.proto\032\023AbilityS" + - "tring.proto\"\233\003\n\031AbilityMetaModifierChang" + - "e\022=\n\033attached_instanced_modifier\030\017 \001(\0132\030" + - ".AbilityAttachedModifier\022\027\n\017server_buff_" + - "uid\030\005 \001(\r\022%\n\nproperties\030\006 \003(\0132\021.Modifier" + - "Property\022\023\n\013BNMCKEBPDGI\030\013 \001(\010\022\"\n\032is_atta" + - "ched_parent_ability\030\002 \001(\010\022\027\n\017apply_entit" + - "y_id\030\t \001(\r\022\037\n\006action\030\001 \001(\0162\017.ModifierAct" + - "ion\022\023\n\013HEDGMMNKADC\030\n \001(\010\022+\n\023parent_abili" + - "ty_name\030\007 \001(\0132\016.AbilityString\022/\n\027parent_" + - "ability_override\030\010 \001(\0132\016.AbilityString\022\031" + - "\n\021modifier_local_id\030\016 \001(\005B\033\n\031emu.grasscu" + - "tter.net.protob\006proto3" + "tyAttachedModifier.proto\032\024ModifierAction" + + ".proto\032\023AbilityString.proto\032\026ModifierPro" + + "perty.proto\"\305\003\n\031AbilityMetaModifierChang" + + "e\022=\n\033attached_instanced_modifier\030\001 \001(\0132\030" + + ".AbilityAttachedModifier\022\031\n\021modifier_loc" + + "al_id\030\002 \001(\005\022\"\n\032is_attached_parent_abilit" + + "y\030\003 \001(\010\022\023\n\013EBAFPMJDPBC\030\005 \001(\004\022\023\n\013LDJJJKNA" + + "BGD\030\006 \001(\002\022\037\n\006action\030\007 \001(\0162\017.ModifierActi" + + "on\022\023\n\013INGHBKHOLMO\030\010 \001(\010\022/\n\027parent_abilit" + + "y_override\030\t \001(\0132\016.AbilityString\022%\n\nprop" + + "erties\030\n \003(\0132\021.ModifierProperty\022+\n\023paren" + + "t_ability_name\030\013 \001(\0132\016.AbilityString\022\027\n\017" + + "server_buff_uid\030\014 \001(\r\022\027\n\017apply_entity_id" + + "\030\r \001(\r\022\023\n\013FCBFPCNFHLA\030\017 \001(\010B\033\n\031emu.grass" + + "cutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.getDescriptor(), - emu.grasscutter.net.proto.ModifierPropertyOuterClass.getDescriptor(), emu.grasscutter.net.proto.ModifierActionOuterClass.getDescriptor(), emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(), + emu.grasscutter.net.proto.ModifierPropertyOuterClass.getDescriptor(), }); internal_static_AbilityMetaModifierChange_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_AbilityMetaModifierChange_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AbilityMetaModifierChange_descriptor, - new java.lang.String[] { "AttachedInstancedModifier", "ServerBuffUid", "Properties", "BNMCKEBPDGI", "IsAttachedParentAbility", "ApplyEntityId", "Action", "HEDGMMNKADC", "ParentAbilityName", "ParentAbilityOverride", "ModifierLocalId", }); + new java.lang.String[] { "AttachedInstancedModifier", "ModifierLocalId", "IsAttachedParentAbility", "EBAFPMJDPBC", "LDJJJKNABGD", "Action", "INGHBKHOLMO", "ParentAbilityOverride", "Properties", "ParentAbilityName", "ServerBuffUid", "ApplyEntityId", "FCBFPCNFHLA", }); emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.getDescriptor(); - emu.grasscutter.net.proto.ModifierPropertyOuterClass.getDescriptor(); emu.grasscutter.net.proto.ModifierActionOuterClass.getDescriptor(); emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(); + emu.grasscutter.net.proto.ModifierPropertyOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaReInitOverrideMapOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaReInitOverrideMapOuterClass.java index c9fcde979d7..a881a8243f7 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaReInitOverrideMapOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaReInitOverrideMapOuterClass.java @@ -19,32 +19,33 @@ public interface AbilityMetaReInitOverrideMapOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ java.util.List getOverrideMapList(); /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index); /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ int getOverrideMapCount(); /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ java.util.List getOverrideMapOrBuilderList(); /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder( int index); } /** * 
-   * Obf: DKNHIBDBJDH
+   * 5.0
+   * obf: BENLIBOCJLP
    *
* * Protobuf type {@code AbilityMetaReInitOverrideMap} @@ -93,7 +94,7 @@ private AbilityMetaReInitOverrideMap( case 0: done = true; break; - case 82: { + case 66: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { overrideMap_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -137,17 +138,17 @@ private AbilityMetaReInitOverrideMap( emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap.class, emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap.Builder.class); } - public static final int OVERRIDE_MAP_FIELD_NUMBER = 10; + public static final int OVERRIDE_MAP_FIELD_NUMBER = 8; private java.util.List overrideMap_; /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ @java.lang.Override public java.util.List getOverrideMapList() { return overrideMap_; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ @java.lang.Override public java.util.List @@ -155,21 +156,21 @@ public java.util.Listrepeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ @java.lang.Override public int getOverrideMapCount() { return overrideMap_.size(); } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index) { return overrideMap_.get(index); } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder( @@ -192,7 +193,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < overrideMap_.size(); i++) { - output.writeMessage(10, overrideMap_.get(i)); + output.writeMessage(8, overrideMap_.get(i)); } unknownFields.writeTo(output); } @@ -205,7 +206,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < overrideMap_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, overrideMap_.get(i)); + .computeMessageSize(8, overrideMap_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -336,7 +337,8 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: DKNHIBDBJDH
+     * 5.0
+     * obf: BENLIBOCJLP
      *
* * Protobuf type {@code AbilityMetaReInitOverrideMap} @@ -536,7 +538,7 @@ private void ensureOverrideMapIsMutable() { emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder> overrideMapBuilder_; /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public java.util.List getOverrideMapList() { if (overrideMapBuilder_ == null) { @@ -546,7 +548,7 @@ public java.util.Listrepeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public int getOverrideMapCount() { if (overrideMapBuilder_ == null) { @@ -556,7 +558,7 @@ public int getOverrideMapCount() { } } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry getOverrideMap(int index) { if (overrideMapBuilder_ == null) { @@ -566,7 +568,7 @@ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar } } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder setOverrideMap( int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) { @@ -583,7 +585,7 @@ public Builder setOverrideMap( return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder setOverrideMap( int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) { @@ -597,7 +599,7 @@ public Builder setOverrideMap( return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder addOverrideMap(emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) { if (overrideMapBuilder_ == null) { @@ -613,7 +615,7 @@ public Builder addOverrideMap(emu.grasscutter.net.proto.AbilityScalarValueEntryO return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder addOverrideMap( int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry value) { @@ -630,7 +632,7 @@ public Builder addOverrideMap( return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder addOverrideMap( emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) { @@ -644,7 +646,7 @@ public Builder addOverrideMap( return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder addOverrideMap( int index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder builderForValue) { @@ -658,7 +660,7 @@ public Builder addOverrideMap( return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder addAllOverrideMap( java.lang.Iterable values) { @@ -673,7 +675,7 @@ public Builder addAllOverrideMap( return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder clearOverrideMap() { if (overrideMapBuilder_ == null) { @@ -686,7 +688,7 @@ public Builder clearOverrideMap() { return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public Builder removeOverrideMap(int index) { if (overrideMapBuilder_ == null) { @@ -699,14 +701,14 @@ public Builder removeOverrideMap(int index) { return this; } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder getOverrideMapBuilder( int index) { return getOverrideMapFieldBuilder().getBuilder(index); } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntryOrBuilder getOverrideMapOrBuilder( int index) { @@ -716,7 +718,7 @@ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar } } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public java.util.List getOverrideMapOrBuilderList() { @@ -727,14 +729,14 @@ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar } } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder addOverrideMapBuilder() { return getOverrideMapFieldBuilder().addBuilder( emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.getDefaultInstance()); } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.Builder addOverrideMapBuilder( int index) { @@ -742,7 +744,7 @@ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar index, emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.getDefaultInstance()); } /** - * repeated .AbilityScalarValueEntry override_map = 10; + * repeated .AbilityScalarValueEntry override_map = 8; */ public java.util.List getOverrideMapBuilderList() { @@ -831,7 +833,7 @@ public emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityM java.lang.String[] descriptorData = { "\n\"AbilityMetaReInitOverrideMap.proto\032\035Ab" + "ilityScalarValueEntry.proto\"N\n\034AbilityMe" + - "taReInitOverrideMap\022.\n\014override_map\030\n \003(" + + "taReInitOverrideMap\022.\n\014override_map\030\010 \003(" + "\0132\030.AbilityScalarValueEntryB\033\n\031emu.grass" + "cutter.net.protob\006proto3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetKilledStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetKilledStateOuterClass.java index a294f4c0369..d497db6b409 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetKilledStateOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMetaSetKilledStateOuterClass.java @@ -19,12 +19,16 @@ public interface AbilityMetaSetKilledStateOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool killed = 6; + * bool killed = 1; * @return The killed. */ boolean getKilled(); } /** + * 
+   * 5.0 test
+   *
+ * * Protobuf type {@code AbilityMetaSetKilledState} */ public static final class AbilityMetaSetKilledState extends @@ -69,7 +73,7 @@ private AbilityMetaSetKilledState( case 0: done = true; break; - case 48: { + case 8: { killed_ = input.readBool(); break; @@ -106,10 +110,10 @@ private AbilityMetaSetKilledState( emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.class, emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState.Builder.class); } - public static final int KILLED_FIELD_NUMBER = 6; + public static final int KILLED_FIELD_NUMBER = 1; private boolean killed_; /** - * bool killed = 6; + * bool killed = 1; * @return The killed. */ @java.lang.Override @@ -132,7 +136,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (killed_ != false) { - output.writeBool(6, killed_); + output.writeBool(1, killed_); } unknownFields.writeTo(output); } @@ -145,7 +149,7 @@ public int getSerializedSize() { size = 0; if (killed_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, killed_); + .computeBoolSize(1, killed_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -274,6 +278,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * 5.0 test
+     *
+ * * Protobuf type {@code AbilityMetaSetKilledState} */ public static final class Builder extends @@ -422,7 +430,7 @@ public Builder mergeFrom( private boolean killed_ ; /** - * bool killed = 6; + * bool killed = 1; * @return The killed. */ @java.lang.Override @@ -430,7 +438,7 @@ public boolean getKilled() { return killed_; } /** - * bool killed = 6; + * bool killed = 1; * @param value The killed to set. * @return This builder for chaining. */ @@ -441,7 +449,7 @@ public Builder setKilled(boolean value) { return this; } /** - * bool killed = 6; + * bool killed = 1; * @return This builder for chaining. */ public Builder clearKilled() { @@ -518,7 +526,7 @@ public emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMeta static { java.lang.String[] descriptorData = { "\n\037AbilityMetaSetKilledState.proto\"+\n\031Abi" + - "lityMetaSetKilledState\022\016\n\006killed\030\006 \001(\010B\033" + + "lityMetaSetKilledState\022\016\n\006killed\030\001 \001(\010B\033" + "\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java index 613a3b9afa0..fde52f9ea48 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java @@ -33,68 +33,11 @@ public interface AbilityScalarValueEntryOrBuilder extends */ emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getKeyOrBuilder(); - /** - * .AbilityScalarType value_type = 2; - * @return The enum numeric value on the wire for valueType. - */ - int getValueTypeValue(); - /** - * .AbilityScalarType value_type = 2; - * @return The valueType. - */ - emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType getValueType(); - - /** - * float float_value = 3; - * @return Whether the floatValue field is set. - */ - boolean hasFloatValue(); /** * float float_value = 3; * @return The floatValue. */ float getFloatValue(); - - /** - * string string_value = 4; - * @return Whether the stringValue field is set. - */ - boolean hasStringValue(); - /** - * string string_value = 4; - * @return The stringValue. - */ - java.lang.String getStringValue(); - /** - * string string_value = 4; - * @return The bytes for stringValue. - */ - com.google.protobuf.ByteString - getStringValueBytes(); - - /** - * int32 int_value = 5; - * @return Whether the intValue field is set. - */ - boolean hasIntValue(); - /** - * int32 int_value = 5; - * @return The intValue. - */ - int getIntValue(); - - /** - * uint32 uint_value = 6; - * @return Whether the uintValue field is set. - */ - boolean hasUintValue(); - /** - * uint32 uint_value = 6; - * @return The uintValue. - */ - int getUintValue(); - - public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.ValueCase getValueCase(); } /** * Protobuf type {@code AbilityScalarValueEntry} @@ -109,7 +52,6 @@ private AbilityScalarValueEntry(com.google.protobuf.GeneratedMessageV3.Builder.AbilityScalarType value_type = 2; - * @return The enum numeric value on the wire for valueType. - */ - @java.lang.Override public int getValueTypeValue() { - return valueType_; - } - /** - * .AbilityScalarType value_type = 2; - * @return The valueType. - */ - @java.lang.Override public emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType getValueType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType result = emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.valueOf(valueType_); - return result == null ? emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.UNRECOGNIZED : result; - } - public static final int FLOAT_VALUE_FIELD_NUMBER = 3; - /** - * float float_value = 3; - * @return Whether the floatValue field is set. - */ - @java.lang.Override - public boolean hasFloatValue() { - return valueCase_ == 3; - } + private float floatValue_; /** * float float_value = 3; * @return The floatValue. */ @java.lang.Override public float getFloatValue() { - if (valueCase_ == 3) { - return (java.lang.Float) value_; - } - return 0F; - } - - public static final int STRING_VALUE_FIELD_NUMBER = 4; - /** - * string string_value = 4; - * @return Whether the stringValue field is set. - */ - public boolean hasStringValue() { - return valueCase_ == 4; - } - /** - * string string_value = 4; - * @return The stringValue. - */ - public java.lang.String getStringValue() { - java.lang.Object ref = ""; - if (valueCase_ == 4) { - ref = value_; - } - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (valueCase_ == 4) { - value_ = s; - } - return s; - } - } - /** - * string string_value = 4; - * @return The bytes for stringValue. - */ - public com.google.protobuf.ByteString - getStringValueBytes() { - java.lang.Object ref = ""; - if (valueCase_ == 4) { - ref = value_; - } - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - if (valueCase_ == 4) { - value_ = b; - } - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int INT_VALUE_FIELD_NUMBER = 5; - /** - * int32 int_value = 5; - * @return Whether the intValue field is set. - */ - @java.lang.Override - public boolean hasIntValue() { - return valueCase_ == 5; - } - /** - * int32 int_value = 5; - * @return The intValue. - */ - @java.lang.Override - public int getIntValue() { - if (valueCase_ == 5) { - return (java.lang.Integer) value_; - } - return 0; - } - - public static final int UINT_VALUE_FIELD_NUMBER = 6; - /** - * uint32 uint_value = 6; - * @return Whether the uintValue field is set. - */ - @java.lang.Override - public boolean hasUintValue() { - return valueCase_ == 6; - } - /** - * uint32 uint_value = 6; - * @return The uintValue. - */ - @java.lang.Override - public int getUintValue() { - if (valueCase_ == 6) { - return (java.lang.Integer) value_; - } - return 0; + return floatValue_; } private byte memoizedIsInitialized = -1; @@ -436,23 +188,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (key_ != null) { output.writeMessage(1, getKey()); } - if (valueType_ != emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.ABILITY_SCALAR_TYPE_UNKNOW.getNumber()) { - output.writeEnum(2, valueType_); - } - if (valueCase_ == 3) { - output.writeFloat( - 3, (float)((java.lang.Float) value_)); - } - if (valueCase_ == 4) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, value_); - } - if (valueCase_ == 5) { - output.writeInt32( - 5, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 6) { - output.writeUInt32( - 6, (int)((java.lang.Integer) value_)); + if (floatValue_ != 0F) { + output.writeFloat(3, floatValue_); } unknownFields.writeTo(output); } @@ -467,27 +204,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, getKey()); } - if (valueType_ != emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.ABILITY_SCALAR_TYPE_UNKNOW.getNumber()) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(2, valueType_); - } - if (valueCase_ == 3) { - size += com.google.protobuf.CodedOutputStream - .computeFloatSize( - 3, (float)((java.lang.Float) value_)); - } - if (valueCase_ == 4) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, value_); - } - if (valueCase_ == 5) { + if (floatValue_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size( - 5, (int)((java.lang.Integer) value_)); - } - if (valueCase_ == 6) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size( - 6, (int)((java.lang.Integer) value_)); + .computeFloatSize(3, floatValue_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -509,29 +228,9 @@ public boolean equals(final java.lang.Object obj) { if (!getKey() .equals(other.getKey())) return false; } - if (valueType_ != other.valueType_) return false; - if (!getValueCase().equals(other.getValueCase())) return false; - switch (valueCase_) { - case 3: - if (java.lang.Float.floatToIntBits(getFloatValue()) - != java.lang.Float.floatToIntBits( - other.getFloatValue())) return false; - break; - case 4: - if (!getStringValue() - .equals(other.getStringValue())) return false; - break; - case 5: - if (getIntValue() - != other.getIntValue()) return false; - break; - case 6: - if (getUintValue() - != other.getUintValue()) return false; - break; - case 0: - default: - } + if (java.lang.Float.floatToIntBits(getFloatValue()) + != java.lang.Float.floatToIntBits( + other.getFloatValue())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -547,29 +246,9 @@ public int hashCode() { hash = (37 * hash) + KEY_FIELD_NUMBER; hash = (53 * hash) + getKey().hashCode(); } - hash = (37 * hash) + VALUE_TYPE_FIELD_NUMBER; - hash = (53 * hash) + valueType_; - switch (valueCase_) { - case 3: - hash = (37 * hash) + FLOAT_VALUE_FIELD_NUMBER; - hash = (53 * hash) + java.lang.Float.floatToIntBits( - getFloatValue()); - break; - case 4: - hash = (37 * hash) + STRING_VALUE_FIELD_NUMBER; - hash = (53 * hash) + getStringValue().hashCode(); - break; - case 5: - hash = (37 * hash) + INT_VALUE_FIELD_NUMBER; - hash = (53 * hash) + getIntValue(); - break; - case 6: - hash = (37 * hash) + UINT_VALUE_FIELD_NUMBER; - hash = (53 * hash) + getUintValue(); - break; - case 0: - default: - } + hash = (37 * hash) + FLOAT_VALUE_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getFloatValue()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -709,10 +388,8 @@ public Builder clear() { key_ = null; keyBuilder_ = null; } - valueType_ = 0; + floatValue_ = 0F; - valueCase_ = 0; - value_ = null; return this; } @@ -744,20 +421,7 @@ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar } else { result.key_ = keyBuilder_.build(); } - result.valueType_ = valueType_; - if (valueCase_ == 3) { - result.value_ = value_; - } - if (valueCase_ == 4) { - result.value_ = value_; - } - if (valueCase_ == 5) { - result.value_ = value_; - } - if (valueCase_ == 6) { - result.value_ = value_; - } - result.valueCase_ = valueCase_; + result.floatValue_ = floatValue_; onBuilt(); return result; } @@ -809,31 +473,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AbilityScalarValueEntryOuterC if (other.hasKey()) { mergeKey(other.getKey()); } - if (other.valueType_ != 0) { - setValueTypeValue(other.getValueTypeValue()); - } - switch (other.getValueCase()) { - case FLOAT_VALUE: { - setFloatValue(other.getFloatValue()); - break; - } - case STRING_VALUE: { - valueCase_ = 4; - value_ = other.value_; - onChanged(); - break; - } - case INT_VALUE: { - setIntValue(other.getIntValue()); - break; - } - case UINT_VALUE: { - setUintValue(other.getUintValue()); - break; - } - case VALUE_NOT_SET: { - break; - } + if (other.getFloatValue() != 0F) { + setFloatValue(other.getFloatValue()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -863,21 +504,6 @@ public Builder mergeFrom( } return this; } - private int valueCase_ = 0; - private java.lang.Object value_; - public ValueCase - getValueCase() { - return ValueCase.forNumber( - valueCase_); - } - - public Builder clearValue() { - valueCase_ = 0; - value_ = null; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString key_; private com.google.protobuf.SingleFieldBuilderV3< @@ -998,76 +624,14 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder return keyBuilder_; } - private int valueType_ = 0; - /** - * .AbilityScalarType value_type = 2; - * @return The enum numeric value on the wire for valueType. - */ - @java.lang.Override public int getValueTypeValue() { - return valueType_; - } - /** - * .AbilityScalarType value_type = 2; - * @param value The enum numeric value on the wire for valueType to set. - * @return This builder for chaining. - */ - public Builder setValueTypeValue(int value) { - - valueType_ = value; - onChanged(); - return this; - } - /** - * .AbilityScalarType value_type = 2; - * @return The valueType. - */ - @java.lang.Override - public emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType getValueType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType result = emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.valueOf(valueType_); - return result == null ? emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType.UNRECOGNIZED : result; - } - /** - * .AbilityScalarType value_type = 2; - * @param value The valueType to set. - * @return This builder for chaining. - */ - public Builder setValueType(emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType value) { - if (value == null) { - throw new NullPointerException(); - } - - valueType_ = value.getNumber(); - onChanged(); - return this; - } - /** - * .AbilityScalarType value_type = 2; - * @return This builder for chaining. - */ - public Builder clearValueType() { - - valueType_ = 0; - onChanged(); - return this; - } - - /** - * float float_value = 3; - * @return Whether the floatValue field is set. - */ - public boolean hasFloatValue() { - return valueCase_ == 3; - } + private float floatValue_ ; /** * float float_value = 3; * @return The floatValue. */ + @java.lang.Override public float getFloatValue() { - if (valueCase_ == 3) { - return (java.lang.Float) value_; - } - return 0F; + return floatValue_; } /** * float float_value = 3; @@ -1075,8 +639,8 @@ public float getFloatValue() { * @return This builder for chaining. */ public Builder setFloatValue(float value) { - valueCase_ = 3; - value_ = value; + + floatValue_ = value; onChanged(); return this; } @@ -1085,192 +649,11 @@ public Builder setFloatValue(float value) { * @return This builder for chaining. */ public Builder clearFloatValue() { - if (valueCase_ == 3) { - valueCase_ = 0; - value_ = null; - onChanged(); - } - return this; - } - - /** - * string string_value = 4; - * @return Whether the stringValue field is set. - */ - @java.lang.Override - public boolean hasStringValue() { - return valueCase_ == 4; - } - /** - * string string_value = 4; - * @return The stringValue. - */ - @java.lang.Override - public java.lang.String getStringValue() { - java.lang.Object ref = ""; - if (valueCase_ == 4) { - ref = value_; - } - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (valueCase_ == 4) { - value_ = s; - } - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * string string_value = 4; - * @return The bytes for stringValue. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getStringValueBytes() { - java.lang.Object ref = ""; - if (valueCase_ == 4) { - ref = value_; - } - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - if (valueCase_ == 4) { - value_ = b; - } - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * string string_value = 4; - * @param value The stringValue to set. - * @return This builder for chaining. - */ - public Builder setStringValue( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - valueCase_ = 4; - value_ = value; - onChanged(); - return this; - } - /** - * string string_value = 4; - * @return This builder for chaining. - */ - public Builder clearStringValue() { - if (valueCase_ == 4) { - valueCase_ = 0; - value_ = null; - onChanged(); - } - return this; - } - /** - * string string_value = 4; - * @param value The bytes for stringValue to set. - * @return This builder for chaining. - */ - public Builder setStringValueBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - valueCase_ = 4; - value_ = value; - onChanged(); - return this; - } - - /** - * int32 int_value = 5; - * @return Whether the intValue field is set. - */ - public boolean hasIntValue() { - return valueCase_ == 5; - } - /** - * int32 int_value = 5; - * @return The intValue. - */ - public int getIntValue() { - if (valueCase_ == 5) { - return (java.lang.Integer) value_; - } - return 0; - } - /** - * int32 int_value = 5; - * @param value The intValue to set. - * @return This builder for chaining. - */ - public Builder setIntValue(int value) { - valueCase_ = 5; - value_ = value; - onChanged(); - return this; - } - /** - * int32 int_value = 5; - * @return This builder for chaining. - */ - public Builder clearIntValue() { - if (valueCase_ == 5) { - valueCase_ = 0; - value_ = null; - onChanged(); - } - return this; - } - - /** - * uint32 uint_value = 6; - * @return Whether the uintValue field is set. - */ - public boolean hasUintValue() { - return valueCase_ == 6; - } - /** - * uint32 uint_value = 6; - * @return The uintValue. - */ - public int getUintValue() { - if (valueCase_ == 6) { - return (java.lang.Integer) value_; - } - return 0; - } - /** - * uint32 uint_value = 6; - * @param value The uintValue to set. - * @return This builder for chaining. - */ - public Builder setUintValue(int value) { - valueCase_ = 6; - value_ = value; + + floatValue_ = 0F; onChanged(); return this; } - /** - * uint32 uint_value = 6; - * @return This builder for chaining. - */ - public Builder clearUintValue() { - if (valueCase_ == 6) { - valueCase_ = 0; - value_ = null; - onChanged(); - } - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1339,13 +722,10 @@ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar static { java.lang.String[] descriptorData = { "\n\035AbilityScalarValueEntry.proto\032\023Ability" + - "String.proto\032\027AbilityScalarType.proto\"\301\001" + - "\n\027AbilityScalarValueEntry\022\033\n\003key\030\001 \001(\0132\016" + - ".AbilityString\022&\n\nvalue_type\030\002 \001(\0162\022.Abi" + - "lityScalarType\022\025\n\013float_value\030\003 \001(\002H\000\022\026\n" + - "\014string_value\030\004 \001(\tH\000\022\023\n\tint_value\030\005 \001(\005" + - "H\000\022\024\n\nuint_value\030\006 \001(\rH\000B\007\n\005valueB\033\n\031emu" + - ".grasscutter.net.protob\006proto3" + "String.proto\032\027AbilityScalarType.proto\"K\n" + + "\027AbilityScalarValueEntry\022\033\n\003key\030\001 \001(\0132\016." + + "AbilityString\022\023\n\013float_value\030\003 \001(\002B\033\n\031em" + + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1358,7 +738,7 @@ public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar internal_static_AbilityScalarValueEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AbilityScalarValueEntry_descriptor, - new java.lang.String[] { "Key", "ValueType", "FloatValue", "StringValue", "IntValue", "UintValue", "Value", }); + new java.lang.String[] { "Key", "FloatValue", }); emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(); emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AchievementUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AchievementUpdateNotifyOuterClass.java index cd62bf58446..6e4682f2069 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AchievementUpdateNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AchievementUpdateNotifyOuterClass.java @@ -19,33 +19,33 @@ public interface AchievementUpdateNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ java.util.List getAchievementListList(); /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index); /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ int getAchievementListCount(); /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ java.util.List getAchievementListOrBuilderList(); /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder( int index); } /** * 
-   * CmdId: 4460
-   * Obf: IDGAPFJMLNJ
+   * CmdId: 26226
+   * obf: PJIBCIGJNAK
    *
* * Protobuf type {@code AchievementUpdateNotify} @@ -94,7 +94,7 @@ private AchievementUpdateNotify( case 0: done = true; break; - case 122: { + case 42: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { achievementList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -138,17 +138,17 @@ private AchievementUpdateNotify( emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.class, emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUpdateNotify.Builder.class); } - public static final int ACHIEVEMENT_LIST_FIELD_NUMBER = 15; + public static final int ACHIEVEMENT_LIST_FIELD_NUMBER = 5; private java.util.List achievementList_; /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ @java.lang.Override public java.util.List getAchievementListList() { return achievementList_; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ @java.lang.Override public java.util.List @@ -156,21 +156,21 @@ public java.util.Listrepeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ @java.lang.Override public int getAchievementListCount() { return achievementList_.size(); } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) { return achievementList_.get(index); } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder( @@ -193,7 +193,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < achievementList_.size(); i++) { - output.writeMessage(15, achievementList_.get(i)); + output.writeMessage(5, achievementList_.get(i)); } unknownFields.writeTo(output); } @@ -206,7 +206,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < achievementList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, achievementList_.get(i)); + .computeMessageSize(5, achievementList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -337,8 +337,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 4460
-     * Obf: IDGAPFJMLNJ
+     * CmdId: 26226
+     * obf: PJIBCIGJNAK
      *
* * Protobuf type {@code AchievementUpdateNotify} @@ -538,7 +538,7 @@ private void ensureAchievementListIsMutable() { emu.grasscutter.net.proto.AchievementOuterClass.Achievement, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder, emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> achievementListBuilder_; /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public java.util.List getAchievementListList() { if (achievementListBuilder_ == null) { @@ -548,7 +548,7 @@ public java.util.Listrepeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public int getAchievementListCount() { if (achievementListBuilder_ == null) { @@ -558,7 +558,7 @@ public int getAchievementListCount() { } } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) { if (achievementListBuilder_ == null) { @@ -568,7 +568,7 @@ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievemen } } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder setAchievementList( int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) { @@ -585,7 +585,7 @@ public Builder setAchievementList( return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder setAchievementList( int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) { @@ -599,7 +599,7 @@ public Builder setAchievementList( return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder addAchievementList(emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) { if (achievementListBuilder_ == null) { @@ -615,7 +615,7 @@ public Builder addAchievementList(emu.grasscutter.net.proto.AchievementOuterClas return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder addAchievementList( int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) { @@ -632,7 +632,7 @@ public Builder addAchievementList( return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder addAchievementList( emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) { @@ -646,7 +646,7 @@ public Builder addAchievementList( return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder addAchievementList( int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) { @@ -660,7 +660,7 @@ public Builder addAchievementList( return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder addAllAchievementList( java.lang.Iterable values) { @@ -675,7 +675,7 @@ public Builder addAllAchievementList( return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder clearAchievementList() { if (achievementListBuilder_ == null) { @@ -688,7 +688,7 @@ public Builder clearAchievementList() { return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public Builder removeAchievementList(int index) { if (achievementListBuilder_ == null) { @@ -701,14 +701,14 @@ public Builder removeAchievementList(int index) { return this; } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder getAchievementListBuilder( int index) { return getAchievementListFieldBuilder().getBuilder(index); } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder( int index) { @@ -718,7 +718,7 @@ public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getA } } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public java.util.List getAchievementListOrBuilderList() { @@ -729,14 +729,14 @@ public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getA } } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder() { return getAchievementListFieldBuilder().addBuilder( emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance()); } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder( int index) { @@ -744,7 +744,7 @@ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAc index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance()); } /** - * repeated .Achievement achievement_list = 15; + * repeated .Achievement achievement_list = 5; */ public java.util.List getAchievementListBuilderList() { @@ -833,7 +833,7 @@ public emu.grasscutter.net.proto.AchievementUpdateNotifyOuterClass.AchievementUp java.lang.String[] descriptorData = { "\n\035AchievementUpdateNotify.proto\032\021Achieve" + "ment.proto\"A\n\027AchievementUpdateNotify\022&\n" + - "\020achievement_list\030\017 \003(\0132\014.AchievementB\033\n" + + "\020achievement_list\030\005 \003(\0132\014.AchievementB\033\n" + "\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java index 7ef090efe44..965eda64886 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java @@ -27,6 +27,7 @@ public interface AddBackupAvatarTeamRspOrBuilder extends /** * 
    * CmdId: 7660
+   * obf: PAKCJCLMNMG
    *
* * Protobuf type {@code AddBackupAvatarTeamRsp} @@ -279,6 +280,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 7660
+     * obf: PAKCJCLMNMG
      *
* * Protobuf type {@code AddBackupAvatarTeamRsp} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java index 1c5aa859cae..85a2afdb34b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java @@ -31,12 +31,20 @@ public interface AddNoGachaAvatarCardNotifyOrBuilder extends int getItemId(); /** + * 
+     * 可能不对 要和下面互换
+     *
+ * * uint32 initial_level = 8; * @return The initialLevel. */ int getInitialLevel(); /** + * 
+     * 可能不对 要和下面互换
+     *
+ * * uint32 initial_promote_level = 9; * @return The initialPromoteLevel. */ @@ -79,6 +87,11 @@ emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaA int index); } /** + * 
+   * CmdId: 28082
+   * obf: MGNNGBNNFEI
+   *
+ * * Protobuf type {@code AddNoGachaAvatarCardNotify} */ public static final class AddNoGachaAvatarCardNotify extends @@ -224,6 +237,10 @@ public int getItemId() { public static final int INITIAL_LEVEL_FIELD_NUMBER = 8; private int initialLevel_; /** + * 
+     * 可能不对 要和下面互换
+     *
+ * * uint32 initial_level = 8; * @return The initialLevel. */ @@ -235,6 +252,10 @@ public int getInitialLevel() { public static final int INITIAL_PROMOTE_LEVEL_FIELD_NUMBER = 9; private int initialPromoteLevel_; /** + * 
+     * 可能不对 要和下面互换
+     *
+ * * uint32 initial_promote_level = 9; * @return The initialPromoteLevel. */ @@ -530,6 +551,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 28082
+     * obf: MGNNGBNNFEI
+     *
+ * * Protobuf type {@code AddNoGachaAvatarCardNotify} */ public static final class Builder extends @@ -814,6 +840,10 @@ public Builder clearItemId() { private int initialLevel_ ; /** + * 
+       * 可能不对 要和下面互换
+       *
+ * * uint32 initial_level = 8; * @return The initialLevel. */ @@ -822,6 +852,10 @@ public int getInitialLevel() { return initialLevel_; } /** + * 
+       * 可能不对 要和下面互换
+       *
+ * * uint32 initial_level = 8; * @param value The initialLevel to set. * @return This builder for chaining. @@ -833,6 +867,10 @@ public Builder setInitialLevel(int value) { return this; } /** + * 
+       * 可能不对 要和下面互换
+       *
+ * * uint32 initial_level = 8; * @return This builder for chaining. */ @@ -845,6 +883,10 @@ public Builder clearInitialLevel() { private int initialPromoteLevel_ ; /** + * 
+       * 可能不对 要和下面互换
+       *
+ * * uint32 initial_promote_level = 9; * @return The initialPromoteLevel. */ @@ -853,6 +895,10 @@ public int getInitialPromoteLevel() { return initialPromoteLevel_; } /** + * 
+       * 可能不对 要和下面互换
+       *
+ * * uint32 initial_promote_level = 9; * @param value The initialPromoteLevel to set. * @return This builder for chaining. @@ -864,6 +910,10 @@ public Builder setInitialPromoteLevel(int value) { return this; } /** + * 
+       * 可能不对 要和下面互换
+       *
+ * * uint32 initial_promote_level = 9; * @return This builder for chaining. */ diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java index 67f06638b15..977d6115446 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java @@ -37,6 +37,10 @@ public interface AddNoGachaAvatarCardTransferItemOrBuilder extends boolean getIsNew(); } /** + * 
+   *obf: JOEIKAFCICE {
+   *
+ * * Protobuf type {@code AddNoGachaAvatarCardTransferItem} */ public static final class AddNoGachaAvatarCardTransferItem extends @@ -340,6 +344,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     *obf: JOEIKAFCICE {
+     *
+ * * Protobuf type {@code AddNoGachaAvatarCardTransferItem} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java index 7a4b9cff1c8..841fd85c742 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AiSyncInfoOuterClass.java @@ -19,26 +19,30 @@ public interface AiSyncInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 entity_id = 2; + * uint32 entity_id = 1; * @return The entityId. */ int getEntityId(); /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 7; * @return The hasPathToTarget. */ boolean getHasPathToTarget(); /** - * bool is_self_killing = 1; + * 
+     * bool类型字段可能不对
+     *
+ * + * bool is_self_killing = 12; * @return The isSelfKilling. */ boolean getIsSelfKilling(); } /** * 
-   * Obf: HLGFNMAEPJO
+   * 5.0.0
    *
* * Protobuf type {@code AiSyncInfo} @@ -87,17 +91,17 @@ private AiSyncInfo( break; case 8: { - isSelfKilling_ = input.readBool(); + entityId_ = input.readUInt32(); break; } - case 16: { + case 56: { - entityId_ = input.readUInt32(); + hasPathToTarget_ = input.readBool(); break; } - case 32: { + case 96: { - hasPathToTarget_ = input.readBool(); + isSelfKilling_ = input.readBool(); break; } default: { @@ -132,10 +136,10 @@ private AiSyncInfo( emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.class, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder.class); } - public static final int ENTITY_ID_FIELD_NUMBER = 2; + public static final int ENTITY_ID_FIELD_NUMBER = 1; private int entityId_; /** - * uint32 entity_id = 2; + * uint32 entity_id = 1; * @return The entityId. */ @java.lang.Override @@ -143,10 +147,10 @@ public int getEntityId() { return entityId_; } - public static final int HAS_PATH_TO_TARGET_FIELD_NUMBER = 4; + public static final int HAS_PATH_TO_TARGET_FIELD_NUMBER = 7; private boolean hasPathToTarget_; /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 7; * @return The hasPathToTarget. */ @java.lang.Override @@ -154,10 +158,14 @@ public boolean getHasPathToTarget() { return hasPathToTarget_; } - public static final int IS_SELF_KILLING_FIELD_NUMBER = 1; + public static final int IS_SELF_KILLING_FIELD_NUMBER = 12; private boolean isSelfKilling_; /** - * bool is_self_killing = 1; + * 
+     * bool类型字段可能不对
+     *
+ * + * bool is_self_killing = 12; * @return The isSelfKilling. */ @java.lang.Override @@ -179,14 +187,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (isSelfKilling_ != false) { - output.writeBool(1, isSelfKilling_); - } if (entityId_ != 0) { - output.writeUInt32(2, entityId_); + output.writeUInt32(1, entityId_); } if (hasPathToTarget_ != false) { - output.writeBool(4, hasPathToTarget_); + output.writeBool(7, hasPathToTarget_); + } + if (isSelfKilling_ != false) { + output.writeBool(12, isSelfKilling_); } unknownFields.writeTo(output); } @@ -197,17 +205,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (isSelfKilling_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, isSelfKilling_); - } if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, entityId_); + .computeUInt32Size(1, entityId_); } if (hasPathToTarget_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, hasPathToTarget_); + .computeBoolSize(7, hasPathToTarget_); + } + if (isSelfKilling_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(12, isSelfKilling_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -346,7 +354,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: HLGFNMAEPJO
+     * 5.0.0
      *
* * Protobuf type {@code AiSyncInfo} @@ -509,7 +517,7 @@ public Builder mergeFrom( private int entityId_ ; /** - * uint32 entity_id = 2; + * uint32 entity_id = 1; * @return The entityId. */ @java.lang.Override @@ -517,7 +525,7 @@ public int getEntityId() { return entityId_; } /** - * uint32 entity_id = 2; + * uint32 entity_id = 1; * @param value The entityId to set. * @return This builder for chaining. */ @@ -528,7 +536,7 @@ public Builder setEntityId(int value) { return this; } /** - * uint32 entity_id = 2; + * uint32 entity_id = 1; * @return This builder for chaining. */ public Builder clearEntityId() { @@ -540,7 +548,7 @@ public Builder clearEntityId() { private boolean hasPathToTarget_ ; /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 7; * @return The hasPathToTarget. */ @java.lang.Override @@ -548,7 +556,7 @@ public boolean getHasPathToTarget() { return hasPathToTarget_; } /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 7; * @param value The hasPathToTarget to set. * @return This builder for chaining. */ @@ -559,7 +567,7 @@ public Builder setHasPathToTarget(boolean value) { return this; } /** - * bool has_path_to_target = 4; + * bool has_path_to_target = 7; * @return This builder for chaining. */ public Builder clearHasPathToTarget() { @@ -571,7 +579,11 @@ public Builder clearHasPathToTarget() { private boolean isSelfKilling_ ; /** - * bool is_self_killing = 1; + * 
+       * bool类型字段可能不对
+       *
+ * + * bool is_self_killing = 12; * @return The isSelfKilling. */ @java.lang.Override @@ -579,7 +591,11 @@ public boolean getIsSelfKilling() { return isSelfKilling_; } /** - * bool is_self_killing = 1; + * 
+       * bool类型字段可能不对
+       *
+ * + * bool is_self_killing = 12; * @param value The isSelfKilling to set. * @return This builder for chaining. */ @@ -590,7 +606,11 @@ public Builder setIsSelfKilling(boolean value) { return this; } /** - * bool is_self_killing = 1; + * 
+       * bool类型字段可能不对
+       *
+ * + * bool is_self_killing = 12; * @return This builder for chaining. */ public Builder clearIsSelfKilling() { @@ -667,8 +687,8 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getDefaultInsta static { java.lang.String[] descriptorData = { "\n\020AiSyncInfo.proto\"T\n\nAiSyncInfo\022\021\n\tenti" + - "ty_id\030\002 \001(\r\022\032\n\022has_path_to_target\030\004 \001(\010\022" + - "\027\n\017is_self_killing\030\001 \001(\010B\033\n\031emu.grasscut" + + "ty_id\030\001 \001(\r\022\032\n\022has_path_to_target\030\007 \001(\010\022" + + "\027\n\017is_self_killing\030\014 \001(\010B\033\n\031emu.grasscut" + "ter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AiThreatInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AiThreatInfoOuterClass.java index 0ce53c65232..9b353ae3213 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AiThreatInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AiThreatInfoOuterClass.java @@ -19,11 +19,11 @@ public interface AiThreatInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ int getAiThreatMapCount(); /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ boolean containsAiThreatMap( int key); @@ -34,29 +34,25 @@ boolean containsAiThreatMap( java.util.Map getAiThreatMap(); /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ java.util.Map getAiThreatMapMap(); /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ int getAiThreatMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ int getAiThreatMapOrThrow( int key); } /** - * 
-   * Obf: HHHCEHIOMEP
-   *
- * * Protobuf type {@code AiThreatInfo} */ public static final class AiThreatInfo extends @@ -102,7 +98,7 @@ private AiThreatInfo( case 0: done = true; break; - case 98: { + case 34: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { aiThreatMap_ = com.google.protobuf.MapField.newMapField( AiThreatMapDefaultEntryHolder.defaultEntry); @@ -144,7 +140,7 @@ private AiThreatInfo( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 12: + case 4: return internalGetAiThreatMap(); default: throw new RuntimeException( @@ -159,7 +155,7 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo.class, emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo.Builder.class); } - public static final int AI_THREAT_MAP_FIELD_NUMBER = 12; + public static final int AI_THREAT_MAP_FIELD_NUMBER = 4; private static final class AiThreatMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -186,7 +182,7 @@ public int getAiThreatMapCount() { return internalGetAiThreatMap().getMap().size(); } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ @java.lang.Override @@ -204,7 +200,7 @@ public java.util.Map getAiThreatMap() { return getAiThreatMapMap(); } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ @java.lang.Override @@ -212,7 +208,7 @@ public java.util.Map getAiThreatMapMap() { return internalGetAiThreatMap().getMap(); } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ @java.lang.Override @@ -225,7 +221,7 @@ public int getAiThreatMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ @java.lang.Override @@ -259,7 +255,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output, internalGetAiThreatMap(), AiThreatMapDefaultEntryHolder.defaultEntry, - 12); + 4); unknownFields.writeTo(output); } @@ -277,7 +273,7 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, aiThreatMap__); + .computeMessageSize(4, aiThreatMap__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -407,10 +403,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: HHHCEHIOMEP
-     *
- * * Protobuf type {@code AiThreatInfo} */ public static final class Builder extends @@ -426,7 +418,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 12: + case 4: return internalGetAiThreatMap(); default: throw new RuntimeException( @@ -437,7 +429,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 12: + case 4: return internalGetMutableAiThreatMap(); default: throw new RuntimeException( @@ -607,7 +599,7 @@ public int getAiThreatMapCount() { return internalGetAiThreatMap().getMap().size(); } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ @java.lang.Override @@ -625,7 +617,7 @@ public java.util.Map getAiThreatMap() { return getAiThreatMapMap(); } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ @java.lang.Override @@ -633,7 +625,7 @@ public java.util.Map getAiThreatMapMap() { return internalGetAiThreatMap().getMap(); } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ @java.lang.Override @@ -646,7 +638,7 @@ public int getAiThreatMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ @java.lang.Override @@ -667,7 +659,7 @@ public Builder clearAiThreatMap() { return this; } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ public Builder removeAiThreatMap( @@ -686,7 +678,7 @@ public Builder removeAiThreatMap( return internalGetMutableAiThreatMap().getMutableMap(); } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ public Builder putAiThreatMap( int key, @@ -698,7 +690,7 @@ public Builder putAiThreatMap( return this; } /** - * map<uint32, uint32> ai_threat_map = 12; + * map<uint32, uint32> ai_threat_map = 4; */ public Builder putAllAiThreatMap( @@ -780,7 +772,7 @@ public emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo getDefaultI static { java.lang.String[] descriptorData = { "\n\022AiThreatInfo.proto\"y\n\014AiThreatInfo\0225\n\r" + - "ai_threat_map\030\014 \003(\0132\036.AiThreatInfo.AiThr" + + "ai_threat_map\030\004 \003(\0132\036.AiThreatInfo.AiThr" + "eatMapEntry\0322\n\020AiThreatMapEntry\022\013\n\003key\030\001" + " \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutt" + "er.net.protob\006proto3" diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AntiAddictNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AntiAddictNotifyOuterClass.java index 6d271d14168..3132fbd431c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AntiAddictNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AntiAddictNotifyOuterClass.java @@ -19,30 +19,30 @@ public interface AntiAddictNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * string level = 7; + * int32 msg_type = 6; + * @return The msgType. + */ + int getMsgType(); + + /** + * string level = 8; * @return The level. */ java.lang.String getLevel(); /** - * string level = 7; + * string level = 8; * @return The bytes for level. */ com.google.protobuf.ByteString getLevelBytes(); /** - * int32 msg_type = 6; - * @return The msgType. - */ - int getMsgType(); - - /** - * string msg = 12; + * string msg = 13; * @return The msg. */ java.lang.String getMsg(); /** - * string msg = 12; + * string msg = 13; * @return The bytes for msg. */ com.google.protobuf.ByteString @@ -50,8 +50,9 @@ public interface AntiAddictNotifyOrBuilder extends } /** * 
-   * CmdId: 23699
-   * Obf: EOHKJFLKHHF
+   * CmdId: 20752
+   * obf: FDPBICNKDBN
+   * 5.0.0
    *
* * Protobuf type {@code AntiAddictNotify} @@ -105,13 +106,13 @@ private AntiAddictNotify( msgType_ = input.readInt32(); break; } - case 58: { + case 66: { java.lang.String s = input.readStringRequireUtf8(); level_ = s; break; } - case 98: { + case 106: { java.lang.String s = input.readStringRequireUtf8(); msg_ = s; @@ -149,10 +150,21 @@ private AntiAddictNotify( emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify.class, emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify.Builder.class); } - public static final int LEVEL_FIELD_NUMBER = 7; + public static final int MSG_TYPE_FIELD_NUMBER = 6; + private int msgType_; + /** + * int32 msg_type = 6; + * @return The msgType. + */ + @java.lang.Override + public int getMsgType() { + return msgType_; + } + + public static final int LEVEL_FIELD_NUMBER = 8; private volatile java.lang.Object level_; /** - * string level = 7; + * string level = 8; * @return The level. */ @java.lang.Override @@ -169,7 +181,7 @@ public java.lang.String getLevel() { } } /** - * string level = 7; + * string level = 8; * @return The bytes for level. */ @java.lang.Override @@ -187,21 +199,10 @@ public java.lang.String getLevel() { } } - public static final int MSG_TYPE_FIELD_NUMBER = 6; - private int msgType_; - /** - * int32 msg_type = 6; - * @return The msgType. - */ - @java.lang.Override - public int getMsgType() { - return msgType_; - } - - public static final int MSG_FIELD_NUMBER = 12; + public static final int MSG_FIELD_NUMBER = 13; private volatile java.lang.Object msg_; /** - * string msg = 12; + * string msg = 13; * @return The msg. */ @java.lang.Override @@ -218,7 +219,7 @@ public java.lang.String getMsg() { } } /** - * string msg = 12; + * string msg = 13; * @return The bytes for msg. */ @java.lang.Override @@ -254,10 +255,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeInt32(6, msgType_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(level_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, level_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, level_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 12, msg_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 13, msg_); } unknownFields.writeTo(output); } @@ -273,10 +274,10 @@ public int getSerializedSize() { .computeInt32Size(6, msgType_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(level_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, level_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, level_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, msg_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, msg_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -293,10 +294,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify other = (emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify) obj; - if (!getLevel() - .equals(other.getLevel())) return false; if (getMsgType() != other.getMsgType()) return false; + if (!getLevel() + .equals(other.getLevel())) return false; if (!getMsg() .equals(other.getMsg())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -310,10 +311,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getLevel().hashCode(); hash = (37 * hash) + MSG_TYPE_FIELD_NUMBER; hash = (53 * hash) + getMsgType(); + hash = (37 * hash) + LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getLevel().hashCode(); hash = (37 * hash) + MSG_FIELD_NUMBER; hash = (53 * hash) + getMsg().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); @@ -413,8 +414,9 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23699
-     * Obf: EOHKJFLKHHF
+     * CmdId: 20752
+     * obf: FDPBICNKDBN
+     * 5.0.0
      *
* * Protobuf type {@code AntiAddictNotify} @@ -454,10 +456,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - level_ = ""; - msgType_ = 0; + level_ = ""; + msg_ = ""; return this; @@ -486,8 +488,8 @@ public emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify bui @java.lang.Override public emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify buildPartial() { emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify result = new emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify(this); - result.level_ = level_; result.msgType_ = msgType_; + result.level_ = level_; result.msg_ = msg_; onBuilt(); return result; @@ -537,13 +539,13 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify other) { if (other == emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify.getDefaultInstance()) return this; + if (other.getMsgType() != 0) { + setMsgType(other.getMsgType()); + } if (!other.getLevel().isEmpty()) { level_ = other.level_; onChanged(); } - if (other.getMsgType() != 0) { - setMsgType(other.getMsgType()); - } if (!other.getMsg().isEmpty()) { msg_ = other.msg_; onChanged(); @@ -577,9 +579,40 @@ public Builder mergeFrom( return this; } + private int msgType_ ; + /** + * int32 msg_type = 6; + * @return The msgType. + */ + @java.lang.Override + public int getMsgType() { + return msgType_; + } + /** + * int32 msg_type = 6; + * @param value The msgType to set. + * @return This builder for chaining. + */ + public Builder setMsgType(int value) { + + msgType_ = value; + onChanged(); + return this; + } + /** + * int32 msg_type = 6; + * @return This builder for chaining. + */ + public Builder clearMsgType() { + + msgType_ = 0; + onChanged(); + return this; + } + private java.lang.Object level_ = ""; /** - * string level = 7; + * string level = 8; * @return The level. */ public java.lang.String getLevel() { @@ -595,7 +628,7 @@ public java.lang.String getLevel() { } } /** - * string level = 7; + * string level = 8; * @return The bytes for level. */ public com.google.protobuf.ByteString @@ -612,7 +645,7 @@ public java.lang.String getLevel() { } } /** - * string level = 7; + * string level = 8; * @param value The level to set. * @return This builder for chaining. */ @@ -627,7 +660,7 @@ public Builder setLevel( return this; } /** - * string level = 7; + * string level = 8; * @return This builder for chaining. */ public Builder clearLevel() { @@ -637,7 +670,7 @@ public Builder clearLevel() { return this; } /** - * string level = 7; + * string level = 8; * @param value The bytes for level to set. * @return This builder for chaining. */ @@ -653,40 +686,9 @@ public Builder setLevelBytes( return this; } - private int msgType_ ; - /** - * int32 msg_type = 6; - * @return The msgType. - */ - @java.lang.Override - public int getMsgType() { - return msgType_; - } - /** - * int32 msg_type = 6; - * @param value The msgType to set. - * @return This builder for chaining. - */ - public Builder setMsgType(int value) { - - msgType_ = value; - onChanged(); - return this; - } - /** - * int32 msg_type = 6; - * @return This builder for chaining. - */ - public Builder clearMsgType() { - - msgType_ = 0; - onChanged(); - return this; - } - private java.lang.Object msg_ = ""; /** - * string msg = 12; + * string msg = 13; * @return The msg. */ public java.lang.String getMsg() { @@ -702,7 +704,7 @@ public java.lang.String getMsg() { } } /** - * string msg = 12; + * string msg = 13; * @return The bytes for msg. */ public com.google.protobuf.ByteString @@ -719,7 +721,7 @@ public java.lang.String getMsg() { } } /** - * string msg = 12; + * string msg = 13; * @param value The msg to set. * @return This builder for chaining. */ @@ -734,7 +736,7 @@ public Builder setMsg( return this; } /** - * string msg = 12; + * string msg = 13; * @return This builder for chaining. */ public Builder clearMsg() { @@ -744,7 +746,7 @@ public Builder clearMsg() { return this; } /** - * string msg = 12; + * string msg = 13; * @param value The bytes for msg to set. * @return This builder for chaining. */ @@ -827,8 +829,8 @@ public emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify get static { java.lang.String[] descriptorData = { "\n\026AntiAddictNotify.proto\"@\n\020AntiAddictNo" + - "tify\022\r\n\005level\030\007 \001(\t\022\020\n\010msg_type\030\006 \001(\005\022\013\n" + - "\003msg\030\014 \001(\tB\033\n\031emu.grasscutter.net.protob" + + "tify\022\020\n\010msg_type\030\006 \001(\005\022\r\n\005level\030\010 \001(\t\022\013\n" + + "\003msg\030\r \001(\tB\033\n\031emu.grasscutter.net.protob" + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -840,7 +842,7 @@ public emu.grasscutter.net.proto.AntiAddictNotifyOuterClass.AntiAddictNotify get internal_static_AntiAddictNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AntiAddictNotify_descriptor, - new java.lang.String[] { "Level", "MsgType", "Msg", }); + new java.lang.String[] { "MsgType", "Level", "Msg", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendRspOuterClass.java index 3520f583a5d..56cdbd61378 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendRspOuterClass.java @@ -19,27 +19,27 @@ public interface AskAddFriendRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 target_uid = 3; - * @return The targetUid. + * int32 retcode = 5; + * @return The retcode. */ - int getTargetUid(); + int getRetcode(); /** - * int32 retcode = 15; - * @return The retcode. + * uint32 target_uid = 7; + * @return The targetUid. */ - int getRetcode(); + int getTargetUid(); /** - * uint32 param = 7; + * uint32 param = 9; * @return The param. */ int getParam(); } /** * 
-   * CmdId: 1146
-   * Obf: DGNBHNPCBNC
+   * CmdId: 25067
+   * obf: CMOJDONPILO
    *
* * Protobuf type {@code AskAddFriendRsp} @@ -86,19 +86,19 @@ private AskAddFriendRsp( case 0: done = true; break; - case 24: { + case 40: { - targetUid_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } case 56: { - param_ = input.readUInt32(); + targetUid_ = input.readUInt32(); break; } - case 120: { + case 72: { - retcode_ = input.readInt32(); + param_ = input.readUInt32(); break; } default: { @@ -133,32 +133,32 @@ private AskAddFriendRsp( emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp.class, emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp.Builder.class); } - public static final int TARGET_UID_FIELD_NUMBER = 3; - private int targetUid_; + public static final int RETCODE_FIELD_NUMBER = 5; + private int retcode_; /** - * uint32 target_uid = 3; - * @return The targetUid. + * int32 retcode = 5; + * @return The retcode. */ @java.lang.Override - public int getTargetUid() { - return targetUid_; + public int getRetcode() { + return retcode_; } - public static final int RETCODE_FIELD_NUMBER = 15; - private int retcode_; + public static final int TARGET_UID_FIELD_NUMBER = 7; + private int targetUid_; /** - * int32 retcode = 15; - * @return The retcode. + * uint32 target_uid = 7; + * @return The targetUid. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getTargetUid() { + return targetUid_; } - public static final int PARAM_FIELD_NUMBER = 7; + public static final int PARAM_FIELD_NUMBER = 9; private int param_; /** - * uint32 param = 7; + * uint32 param = 9; * @return The param. */ @java.lang.Override @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (retcode_ != 0) { + output.writeInt32(5, retcode_); + } if (targetUid_ != 0) { - output.writeUInt32(3, targetUid_); + output.writeUInt32(7, targetUid_); } if (param_ != 0) { - output.writeUInt32(7, param_); - } - if (retcode_ != 0) { - output.writeInt32(15, retcode_); + output.writeUInt32(9, param_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (targetUid_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, targetUid_); + .computeInt32Size(5, retcode_); } - if (param_ != 0) { + if (targetUid_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, param_); + .computeUInt32Size(7, targetUid_); } - if (retcode_ != 0) { + if (param_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(15, retcode_); + .computeUInt32Size(9, param_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,10 +225,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp other = (emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp) obj; - if (getTargetUid() - != other.getTargetUid()) return false; if (getRetcode() != other.getRetcode()) return false; + if (getTargetUid() + != other.getTargetUid()) return false; if (getParam() != other.getParam()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -242,10 +242,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + TARGET_UID_FIELD_NUMBER; - hash = (53 * hash) + getTargetUid(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + TARGET_UID_FIELD_NUMBER; + hash = (53 * hash) + getTargetUid(); hash = (37 * hash) + PARAM_FIELD_NUMBER; hash = (53 * hash) + getParam(); hash = (29 * hash) + unknownFields.hashCode(); @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 1146
-     * Obf: DGNBHNPCBNC
+     * CmdId: 25067
+     * obf: CMOJDONPILO
      *
* * Protobuf type {@code AskAddFriendRsp} @@ -386,10 +386,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - targetUid_ = 0; - retcode_ = 0; + targetUid_ = 0; + param_ = 0; return this; @@ -418,8 +418,8 @@ public emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp build @java.lang.Override public emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp buildPartial() { emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp result = new emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp(this); - result.targetUid_ = targetUid_; result.retcode_ = retcode_; + result.targetUid_ = targetUid_; result.param_ = param_; onBuilt(); return result; @@ -469,12 +469,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp other) { if (other == emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp.getDefaultInstance()) return this; - if (other.getTargetUid() != 0) { - setTargetUid(other.getTargetUid()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } + if (other.getTargetUid() != 0) { + setTargetUid(other.getTargetUid()); + } if (other.getParam() != 0) { setParam(other.getParam()); } @@ -507,71 +507,71 @@ public Builder mergeFrom( return this; } - private int targetUid_ ; + private int retcode_ ; /** - * uint32 target_uid = 3; - * @return The targetUid. + * int32 retcode = 5; + * @return The retcode. */ @java.lang.Override - public int getTargetUid() { - return targetUid_; + public int getRetcode() { + return retcode_; } /** - * uint32 target_uid = 3; - * @param value The targetUid to set. + * int32 retcode = 5; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setTargetUid(int value) { + public Builder setRetcode(int value) { - targetUid_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 target_uid = 3; + * int32 retcode = 5; * @return This builder for chaining. */ - public Builder clearTargetUid() { + public Builder clearRetcode() { - targetUid_ = 0; + retcode_ = 0; onChanged(); return this; } - private int retcode_ ; + private int targetUid_ ; /** - * int32 retcode = 15; - * @return The retcode. + * uint32 target_uid = 7; + * @return The targetUid. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getTargetUid() { + return targetUid_; } /** - * int32 retcode = 15; - * @param value The retcode to set. + * uint32 target_uid = 7; + * @param value The targetUid to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setTargetUid(int value) { - retcode_ = value; + targetUid_ = value; onChanged(); return this; } /** - * int32 retcode = 15; + * uint32 target_uid = 7; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearTargetUid() { - retcode_ = 0; + targetUid_ = 0; onChanged(); return this; } private int param_ ; /** - * uint32 param = 7; + * uint32 param = 9; * @return The param. */ @java.lang.Override @@ -579,7 +579,7 @@ public int getParam() { return param_; } /** - * uint32 param = 7; + * uint32 param = 9; * @param value The param to set. * @return This builder for chaining. */ @@ -590,7 +590,7 @@ public Builder setParam(int value) { return this; } /** - * uint32 param = 7; + * uint32 param = 9; * @return This builder for chaining. */ public Builder clearParam() { @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp getDe static { java.lang.String[] descriptorData = { "\n\025AskAddFriendRsp.proto\"E\n\017AskAddFriendR" + - "sp\022\022\n\ntarget_uid\030\003 \001(\r\022\017\n\007retcode\030\017 \001(\005\022" + - "\r\n\005param\030\007 \001(\rB\033\n\031emu.grasscutter.net.pr" + + "sp\022\017\n\007retcode\030\005 \001(\005\022\022\n\ntarget_uid\030\007 \001(\r\022" + + "\r\n\005param\030\t \001(\rB\033\n\031emu.grasscutter.net.pr" + "otob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.AskAddFriendRspOuterClass.AskAddFriendRsp getDe internal_static_AskAddFriendRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AskAddFriendRsp_descriptor, - new java.lang.String[] { "TargetUid", "Retcode", "Param", }); + new java.lang.String[] { "Retcode", "TargetUid", "Param", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java index 9f321585f55..182e969054b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java @@ -40,6 +40,12 @@ public interface AvatarAddNotifyOrBuilder extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder(); } /** + * 
+   * CmdId: 4216
+   * 5.0.0
+   * obf: NCLFINCCBGF
+   *
+ * * Protobuf type {@code AvatarAddNotify} */ public static final class AvatarAddNotify extends @@ -344,6 +350,12 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 4216
+     * 5.0.0
+     * obf: NCLFINCCBGF
+     *
+ * * Protobuf type {@code AvatarAddNotify} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeElementTypeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeElementTypeReqOuterClass.java index 228c3d6a9f8..7bd9cc0a335 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeElementTypeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeElementTypeReqOuterClass.java @@ -19,21 +19,21 @@ public interface AvatarChangeElementTypeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 area_id = 11; - * @return The areaId. + * uint32 scene_id = 4; + * @return The sceneId. */ - int getAreaId(); + int getSceneId(); /** - * uint32 scene_id = 1; - * @return The sceneId. + * uint32 area_id = 8; + * @return The areaId. */ - int getSceneId(); + int getAreaId(); } /** * 
-   * CmdId: 3696
-   * Obf: EPCCINELCEK
+   * CmdId: 21263
+   * obf: DNPAHCFPJML
    *
* * Protobuf type {@code AvatarChangeElementTypeReq} @@ -80,12 +80,12 @@ private AvatarChangeElementTypeReq( case 0: done = true; break; - case 8: { + case 32: { sceneId_ = input.readUInt32(); break; } - case 88: { + case 64: { areaId_ = input.readUInt32(); break; @@ -122,26 +122,26 @@ private AvatarChangeElementTypeReq( emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq.class, emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq.Builder.class); } - public static final int AREA_ID_FIELD_NUMBER = 11; - private int areaId_; + public static final int SCENE_ID_FIELD_NUMBER = 4; + private int sceneId_; /** - * uint32 area_id = 11; - * @return The areaId. + * uint32 scene_id = 4; + * @return The sceneId. */ @java.lang.Override - public int getAreaId() { - return areaId_; + public int getSceneId() { + return sceneId_; } - public static final int SCENE_ID_FIELD_NUMBER = 1; - private int sceneId_; + public static final int AREA_ID_FIELD_NUMBER = 8; + private int areaId_; /** - * uint32 scene_id = 1; - * @return The sceneId. + * uint32 area_id = 8; + * @return The areaId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getAreaId() { + return areaId_; } private byte memoizedIsInitialized = -1; @@ -159,10 +159,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (sceneId_ != 0) { - output.writeUInt32(1, sceneId_); + output.writeUInt32(4, sceneId_); } if (areaId_ != 0) { - output.writeUInt32(11, areaId_); + output.writeUInt32(8, areaId_); } unknownFields.writeTo(output); } @@ -175,11 +175,11 @@ public int getSerializedSize() { size = 0; if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, sceneId_); + .computeUInt32Size(4, sceneId_); } if (areaId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, areaId_); + .computeUInt32Size(8, areaId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +196,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq other = (emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq) obj; - if (getAreaId() - != other.getAreaId()) return false; if (getSceneId() != other.getSceneId()) return false; + if (getAreaId() + != other.getAreaId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +211,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + AREA_ID_FIELD_NUMBER; - hash = (53 * hash) + getAreaId(); hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); + hash = (37 * hash) + AREA_ID_FIELD_NUMBER; + hash = (53 * hash) + getAreaId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +312,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 3696
-     * Obf: EPCCINELCEK
+     * CmdId: 21263
+     * obf: DNPAHCFPJML
      *
* * Protobuf type {@code AvatarChangeElementTypeReq} @@ -353,10 +353,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - areaId_ = 0; - sceneId_ = 0; + areaId_ = 0; + return this; } @@ -383,8 +383,8 @@ public emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChan @java.lang.Override public emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq buildPartial() { emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq result = new emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq(this); - result.areaId_ = areaId_; result.sceneId_ = sceneId_; + result.areaId_ = areaId_; onBuilt(); return result; } @@ -433,12 +433,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq other) { if (other == emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq.getDefaultInstance()) return this; - if (other.getAreaId() != 0) { - setAreaId(other.getAreaId()); - } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } + if (other.getAreaId() != 0) { + setAreaId(other.getAreaId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +468,64 @@ public Builder mergeFrom( return this; } - private int areaId_ ; + private int sceneId_ ; /** - * uint32 area_id = 11; - * @return The areaId. + * uint32 scene_id = 4; + * @return The sceneId. */ @java.lang.Override - public int getAreaId() { - return areaId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 area_id = 11; - * @param value The areaId to set. + * uint32 scene_id = 4; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setAreaId(int value) { + public Builder setSceneId(int value) { - areaId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 area_id = 11; + * uint32 scene_id = 4; * @return This builder for chaining. */ - public Builder clearAreaId() { + public Builder clearSceneId() { - areaId_ = 0; + sceneId_ = 0; onChanged(); return this; } - private int sceneId_ ; + private int areaId_ ; /** - * uint32 scene_id = 1; - * @return The sceneId. + * uint32 area_id = 8; + * @return The areaId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getAreaId() { + return areaId_; } /** - * uint32 scene_id = 1; - * @param value The sceneId to set. + * uint32 area_id = 8; + * @param value The areaId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setAreaId(int value) { - sceneId_ = value; + areaId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 1; + * uint32 area_id = 8; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearAreaId() { - sceneId_ = 0; + areaId_ = 0; onChanged(); return this; } @@ -597,8 +597,8 @@ public emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChan static { java.lang.String[] descriptorData = { "\n AvatarChangeElementTypeReq.proto\"?\n\032Av" + - "atarChangeElementTypeReq\022\017\n\007area_id\030\013 \001(" + - "\r\022\020\n\010scene_id\030\001 \001(\rB\033\n\031emu.grasscutter.n" + + "atarChangeElementTypeReq\022\020\n\010scene_id\030\004 \001" + + "(\r\022\017\n\007area_id\030\010 \001(\rB\033\n\031emu.grasscutter.n" + "et.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +610,7 @@ public emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChan internal_static_AvatarChangeElementTypeReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarChangeElementTypeReq_descriptor, - new java.lang.String[] { "AreaId", "SceneId", }); + new java.lang.String[] { "SceneId", "AreaId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDelNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDelNotifyOuterClass.java index 8888dd7d977..5a04a9be935 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDelNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDelNotifyOuterClass.java @@ -19,17 +19,17 @@ public interface AvatarDelNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @return A list containing the avatarGuidList. */ java.util.List getAvatarGuidListList(); /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @return The count of avatarGuidList. */ int getAvatarGuidListCount(); /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @param index The index of the element to return. * @return The avatarGuidList at the given index. */ @@ -37,8 +37,9 @@ public interface AvatarDelNotifyOrBuilder extends } /** * 
-   * CmdId: 8219
-   * Obf: IOKBLLAGPJD
+   * CmdId: 24313
+   * obf: FDHLDCFBKNJ
+   * 这里可能解的不对
    *
* * Protobuf type {@code AvatarDelNotify} @@ -87,7 +88,7 @@ private AvatarDelNotify( case 0: done = true; break; - case 56: { + case 32: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { avatarGuidList_ = newLongList(); mutable_bitField0_ |= 0x00000001; @@ -95,7 +96,7 @@ private AvatarDelNotify( avatarGuidList_.addLong(input.readUInt64()); break; } - case 58: { + case 34: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -143,10 +144,10 @@ private AvatarDelNotify( emu.grasscutter.net.proto.AvatarDelNotifyOuterClass.AvatarDelNotify.class, emu.grasscutter.net.proto.AvatarDelNotifyOuterClass.AvatarDelNotify.Builder.class); } - public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 7; + public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 4; private com.google.protobuf.Internal.LongList avatarGuidList_; /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @return A list containing the avatarGuidList. */ @java.lang.Override @@ -155,14 +156,14 @@ private AvatarDelNotify( return avatarGuidList_; } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @return The count of avatarGuidList. */ public int getAvatarGuidListCount() { return avatarGuidList_.size(); } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @param index The index of the element to return. * @return The avatarGuidList at the given index. */ @@ -187,7 +188,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (getAvatarGuidListList().size() > 0) { - output.writeUInt32NoTag(58); + output.writeUInt32NoTag(34); output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize); } for (int i = 0; i < avatarGuidList_.size(); i++) { @@ -345,8 +346,9 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 8219
-     * Obf: IOKBLLAGPJD
+     * CmdId: 24313
+     * obf: FDHLDCFBKNJ
+     * 这里可能解的不对
      *
* * Protobuf type {@code AvatarDelNotify} @@ -516,7 +518,7 @@ private void ensureAvatarGuidListIsMutable() { } } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @return A list containing the avatarGuidList. */ public java.util.List @@ -525,14 +527,14 @@ private void ensureAvatarGuidListIsMutable() { java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_; } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @return The count of avatarGuidList. */ public int getAvatarGuidListCount() { return avatarGuidList_.size(); } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @param index The index of the element to return. * @return The avatarGuidList at the given index. */ @@ -540,7 +542,7 @@ public long getAvatarGuidList(int index) { return avatarGuidList_.getLong(index); } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @param index The index to set the value at. * @param value The avatarGuidList to set. * @return This builder for chaining. @@ -553,7 +555,7 @@ public Builder setAvatarGuidList( return this; } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @param value The avatarGuidList to add. * @return This builder for chaining. */ @@ -564,7 +566,7 @@ public Builder addAvatarGuidList(long value) { return this; } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @param values The avatarGuidList to add. * @return This builder for chaining. */ @@ -577,7 +579,7 @@ public Builder addAllAvatarGuidList( return this; } /** - * repeated uint64 avatar_guid_list = 7; + * repeated uint64 avatar_guid_list = 4; * @return This builder for chaining. */ public Builder clearAvatarGuidList() { @@ -654,7 +656,7 @@ public emu.grasscutter.net.proto.AvatarDelNotifyOuterClass.AvatarDelNotify getDe static { java.lang.String[] descriptorData = { "\n\025AvatarDelNotify.proto\"+\n\017AvatarDelNoti" + - "fy\022\030\n\020avatar_guid_list\030\007 \003(\004B\033\n\031emu.gras" + + "fy\022\030\n\020avatar_guid_list\030\004 \003(\004B\033\n\031emu.gras" + "scutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java index 75dfe7b398e..6415d15f364 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java @@ -53,10 +53,6 @@ emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterI long key); } /** - * 
-   * CmdId: 4274
-   *
- * * Protobuf type {@code AvatarFetterDataNotify} */ public static final class AvatarFetterDataNotify extends @@ -407,10 +403,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * CmdId: 4274
-     *
- * * Protobuf type {@code AvatarFetterDataNotify} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java index 20276743767..38e18e04372 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java @@ -33,6 +33,7 @@ public interface AvatarFetterLevelRewardReqOrBuilder extends /** * 
    * CmdId: 7455
+   * obf: BEKNEDMIPID
    *
* * Protobuf type {@code AvatarFetterLevelRewardReq} @@ -313,6 +314,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 7455
+     * obf: BEKNEDMIPID
      *
* * Protobuf type {@code AvatarFetterLevelRewardReq} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java index 90efe68bc75..20e4c9dd3df 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java @@ -45,6 +45,7 @@ public interface AvatarFetterLevelRewardRspOrBuilder extends /** * 
    * CmdId: 21750
+   * obf: IFEMKGALEMM
    *
* * Protobuf type {@code AvatarFetterLevelRewardRsp} @@ -379,6 +380,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 21750
+     * obf: IFEMKGALEMM
      *
* * Protobuf type {@code AvatarFetterLevelRewardRsp} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java index 6ed05d9fbde..3d208c5245b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java @@ -61,6 +61,7 @@ float getFightPropMapOrThrow( /** * 
    * CmdId: 287
+   * obf: AOGGDBKPBED
    *
* * Protobuf type {@code AvatarFightPropNotify} @@ -443,6 +444,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 287
+     * obf: AOGGDBKPBED
      *
* * Protobuf type {@code AvatarFightPropNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java index e39eeddd0a0..66046980311 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java @@ -61,6 +61,7 @@ float getFightPropMapOrThrow( /** * 
    * CmdId: 20328
+   * obf: CLGMBNOPKDA
    *
* * Protobuf type {@code AvatarFightPropUpdateNotify} @@ -443,6 +444,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 20328
+     * obf: CLGMBNOPKDA
      *
* * Protobuf type {@code AvatarFightPropUpdateNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java index ffee9255f82..715af90644f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java @@ -25,6 +25,12 @@ public interface AvatarPromoteReqOrBuilder extends long getGuid(); } /** + * 
+   * CmdId: 21972
+   * Obf: MHNOADCNPMP
+   * 5.0.0
+   *
+ * * Protobuf type {@code AvatarPromoteReq} */ public static final class AvatarPromoteReq extends @@ -274,6 +280,12 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 21972
+     * Obf: MHNOADCNPMP
+     * 5.0.0
+     *
+ * * Protobuf type {@code AvatarPromoteReq} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java index a31a6ec1558..be40e31695a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java @@ -31,6 +31,11 @@ public interface AvatarPromoteRspOrBuilder extends int getRetcode(); } /** + * 
+   * 5.0.0 test
+   * CmdId: 1987
+   *
+ * * Protobuf type {@code AvatarPromoteRsp} */ public static final class AvatarPromoteRsp extends @@ -307,6 +312,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * 5.0.0 test
+     * CmdId: 1987
+     *
+ * * Protobuf type {@code AvatarPromoteRsp} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java index a8b9dea72f6..41e185eb067 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java @@ -25,16 +25,16 @@ public interface AvatarRenameInfoOrBuilder extends int getAvatarId(); /** - * string avatar_name = 15; - * @return The avatarName. + * string HEMDLGOMMKC = 15; + * @return The hEMDLGOMMKC. */ - java.lang.String getAvatarName(); + java.lang.String getHEMDLGOMMKC(); /** - * string avatar_name = 15; - * @return The bytes for avatarName. + * string HEMDLGOMMKC = 15; + * @return The bytes for hEMDLGOMMKC. */ com.google.protobuf.ByteString - getAvatarNameBytes(); + getHEMDLGOMMKCBytes(); } /** * Protobuf type {@code AvatarRenameInfo} @@ -49,7 +49,7 @@ private AvatarRenameInfo(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } private AvatarRenameInfo() { - avatarName_ = ""; + hEMDLGOMMKC_ = ""; } @java.lang.Override @@ -90,7 +90,7 @@ private AvatarRenameInfo( case 122: { java.lang.String s = input.readStringRequireUtf8(); - avatarName_ = s; + hEMDLGOMMKC_ = s; break; } default: { @@ -136,38 +136,38 @@ public int getAvatarId() { return avatarId_; } - public static final int AVATAR_NAME_FIELD_NUMBER = 15; - private volatile java.lang.Object avatarName_; + public static final int HEMDLGOMMKC_FIELD_NUMBER = 15; + private volatile java.lang.Object hEMDLGOMMKC_; /** - * string avatar_name = 15; - * @return The avatarName. + * string HEMDLGOMMKC = 15; + * @return The hEMDLGOMMKC. */ @java.lang.Override - public java.lang.String getAvatarName() { - java.lang.Object ref = avatarName_; + public java.lang.String getHEMDLGOMMKC() { + java.lang.Object ref = hEMDLGOMMKC_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - avatarName_ = s; + hEMDLGOMMKC_ = s; return s; } } /** - * string avatar_name = 15; - * @return The bytes for avatarName. + * string HEMDLGOMMKC = 15; + * @return The bytes for hEMDLGOMMKC. */ @java.lang.Override public com.google.protobuf.ByteString - getAvatarNameBytes() { - java.lang.Object ref = avatarName_; + getHEMDLGOMMKCBytes() { + java.lang.Object ref = hEMDLGOMMKC_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - avatarName_ = b; + hEMDLGOMMKC_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -191,8 +191,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (avatarId_ != 0) { output.writeUInt32(13, avatarId_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 15, avatarName_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hEMDLGOMMKC_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 15, hEMDLGOMMKC_); } unknownFields.writeTo(output); } @@ -207,8 +207,8 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(13, avatarId_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, avatarName_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hEMDLGOMMKC_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, hEMDLGOMMKC_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -227,8 +227,8 @@ public boolean equals(final java.lang.Object obj) { if (getAvatarId() != other.getAvatarId()) return false; - if (!getAvatarName() - .equals(other.getAvatarName())) return false; + if (!getHEMDLGOMMKC() + .equals(other.getHEMDLGOMMKC())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,8 +242,8 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; hash = (53 * hash) + getAvatarId(); - hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER; - hash = (53 * hash) + getAvatarName().hashCode(); + hash = (37 * hash) + HEMDLGOMMKC_FIELD_NUMBER; + hash = (53 * hash) + getHEMDLGOMMKC().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -379,7 +379,7 @@ public Builder clear() { super.clear(); avatarId_ = 0; - avatarName_ = ""; + hEMDLGOMMKC_ = ""; return this; } @@ -408,7 +408,7 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo bui public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo buildPartial() { emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo result = new emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo(this); result.avatarId_ = avatarId_; - result.avatarName_ = avatarName_; + result.hEMDLGOMMKC_ = hEMDLGOMMKC_; onBuilt(); return result; } @@ -460,8 +460,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.Av if (other.getAvatarId() != 0) { setAvatarId(other.getAvatarId()); } - if (!other.getAvatarName().isEmpty()) { - avatarName_ = other.avatarName_; + if (!other.getHEMDLGOMMKC().isEmpty()) { + hEMDLGOMMKC_ = other.hEMDLGOMMKC_; onChanged(); } this.mergeUnknownFields(other.unknownFields); @@ -524,78 +524,78 @@ public Builder clearAvatarId() { return this; } - private java.lang.Object avatarName_ = ""; + private java.lang.Object hEMDLGOMMKC_ = ""; /** - * string avatar_name = 15; - * @return The avatarName. + * string HEMDLGOMMKC = 15; + * @return The hEMDLGOMMKC. */ - public java.lang.String getAvatarName() { - java.lang.Object ref = avatarName_; + public java.lang.String getHEMDLGOMMKC() { + java.lang.Object ref = hEMDLGOMMKC_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - avatarName_ = s; + hEMDLGOMMKC_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string avatar_name = 15; - * @return The bytes for avatarName. + * string HEMDLGOMMKC = 15; + * @return The bytes for hEMDLGOMMKC. */ public com.google.protobuf.ByteString - getAvatarNameBytes() { - java.lang.Object ref = avatarName_; + getHEMDLGOMMKCBytes() { + java.lang.Object ref = hEMDLGOMMKC_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - avatarName_ = b; + hEMDLGOMMKC_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string avatar_name = 15; - * @param value The avatarName to set. + * string HEMDLGOMMKC = 15; + * @param value The hEMDLGOMMKC to set. * @return This builder for chaining. */ - public Builder setAvatarName( + public Builder setHEMDLGOMMKC( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - avatarName_ = value; + hEMDLGOMMKC_ = value; onChanged(); return this; } /** - * string avatar_name = 15; + * string HEMDLGOMMKC = 15; * @return This builder for chaining. */ - public Builder clearAvatarName() { + public Builder clearHEMDLGOMMKC() { - avatarName_ = getDefaultInstance().getAvatarName(); + hEMDLGOMMKC_ = getDefaultInstance().getHEMDLGOMMKC(); onChanged(); return this; } /** - * string avatar_name = 15; - * @param value The bytes for avatarName to set. + * string HEMDLGOMMKC = 15; + * @param value The bytes for hEMDLGOMMKC to set. * @return This builder for chaining. */ - public Builder setAvatarNameBytes( + public Builder setHEMDLGOMMKCBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - avatarName_ = value; + hEMDLGOMMKC_ = value; onChanged(); return this; } @@ -667,7 +667,7 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo get static { java.lang.String[] descriptorData = { "\n\026AvatarRenameInfo.proto\":\n\020AvatarRename" + - "Info\022\021\n\tavatar_id\030\r \001(\r\022\023\n\013avatar_name\030\017" + + "Info\022\021\n\tavatar_id\030\r \001(\r\022\023\n\013HEMDLGOMMKC\030\017" + " \001(\tB\033\n\031emu.grasscutter.net.protob\006proto" + "3" }; @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo get internal_static_AvatarRenameInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_AvatarRenameInfo_descriptor, - new java.lang.String[] { "AvatarId", "AvatarName", }); + new java.lang.String[] { "AvatarId", "HEMDLGOMMKC", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java index 612f14379b2..04fbf6f8f5d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java @@ -45,6 +45,7 @@ emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBui /** * 
    * CmdId: 4982
+   * obf: AKDEBOHJMHE
    *
* * Protobuf type {@code AvatarSatiationDataNotify} @@ -337,6 +338,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 4982
+     * obf: AKDEBOHJMHE
      *
* * Protobuf type {@code AvatarSatiationDataNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java index 79c14ae7d29..0586153db26 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java @@ -37,6 +37,10 @@ public interface AvatarSatiationDataOrBuilder extends float getFinishTime(); } /** + * 
+   * obf: AFNBGDDDOAD
+   *
+ * * Protobuf type {@code AvatarSatiationData} */ public static final class AvatarSatiationData extends @@ -344,6 +348,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * obf: AFNBGDDDOAD
+     *
+ * * Protobuf type {@code AvatarSatiationData} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java index 769c948387c..85dad5ad93a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java @@ -57,6 +57,7 @@ public interface AvatarSkillChangeNotifyOrBuilder extends /** * 
    * CmdId: 4410
+   * obf: KLHPNKEPAOA
    *
* * Protobuf type {@code AvatarSkillChangeNotify} @@ -445,6 +446,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 4410
+     * obf: KLHPNKEPAOA
      *
* * Protobuf type {@code AvatarSkillChangeNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillDepotChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillDepotChangeNotifyOuterClass.java index 0e30c4ebce2..d3214755d25 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillDepotChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillDepotChangeNotifyOuterClass.java @@ -147,6 +147,7 @@ int getProudSkillExtraLevelMapOrThrow( /** * 
    * CmdId: 25309
+   * obf: KLEALCOODKG
    *
* * Protobuf type {@code AvatarSkillDepotChangeNotify} @@ -889,6 +890,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 25309
+     * obf: KLEALCOODKG
      *
* * Protobuf type {@code AvatarSkillDepotChangeNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java index 4f9e95e2306..e5410c1d0d7 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java @@ -61,6 +61,7 @@ emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapO /** * 
    * CmdId: 25299
+   * obf: BNJBNBIEGBE
    *
* * Protobuf type {@code AvatarSkillInfoNotify} @@ -443,6 +444,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 25299
+     * obf: BNJBNBIEGBE
      *
* * Protobuf type {@code AvatarSkillInfoNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java index 1d8a364bd37..22a5ea1be75 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java @@ -39,6 +39,7 @@ public interface AvatarSkillMaxChargeCountNotifyOrBuilder extends /** * 
    * CmdId: 28497
+   * obf: MFADJMCEBGN
    *
* * Protobuf type {@code AvatarSkillMaxChargeCountNotify} @@ -346,6 +347,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 28497
+     * obf: MFADJMCEBGN
      *
* * Protobuf type {@code AvatarSkillMaxChargeCountNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java index a3bc0f8661a..01736f40fb4 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java @@ -43,6 +43,10 @@ public interface AvatarUnlockTalentNotifyOrBuilder extends int getTalentId(); } /** + * 
+   * CmdId: 28793
+   *
+ * * Protobuf type {@code AvatarUnlockTalentNotify} */ public static final class AvatarUnlockTalentNotify extends @@ -373,6 +377,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 28793
+     *
+ * * Protobuf type {@code AvatarUnlockTalentNotify} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardTakeOptionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardTakeOptionOuterClass.java index 687b6ea89b6..2f5ce215169 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardTakeOptionOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardTakeOptionOuterClass.java @@ -19,29 +19,35 @@ public interface BattlePassRewardTakeOptionOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 option_idx = 14; + * uint32 option_idx = 1; * @return The optionIdx. */ int getOptionIdx(); /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; * @return Whether the tag field is set. */ boolean hasTag(); /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; * @return The tag. */ emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag getTag(); /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder getTagOrBuilder(); + + /** + * uint32 default_reward_type = 12; + * @return The defaultRewardType. + */ + int getDefaultRewardType(); } /** * 
-   * Obf: ABOLHFADNBD
+   * obf: MIAMFOFPFNK
    *
* * Protobuf type {@code BattlePassRewardTakeOption} @@ -88,7 +94,12 @@ private BattlePassRewardTakeOption( case 0: done = true; break; - case 58: { + case 8: { + + optionIdx_ = input.readUInt32(); + break; + } + case 82: { emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder subBuilder = null; if (tag_ != null) { subBuilder = tag_.toBuilder(); @@ -101,9 +112,9 @@ private BattlePassRewardTakeOption( break; } - case 112: { + case 96: { - optionIdx_ = input.readUInt32(); + defaultRewardType_ = input.readUInt32(); break; } default: { @@ -138,10 +149,10 @@ private BattlePassRewardTakeOption( emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.class, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder.class); } - public static final int OPTION_IDX_FIELD_NUMBER = 14; + public static final int OPTION_IDX_FIELD_NUMBER = 1; private int optionIdx_; /** - * uint32 option_idx = 14; + * uint32 option_idx = 1; * @return The optionIdx. */ @java.lang.Override @@ -149,10 +160,10 @@ public int getOptionIdx() { return optionIdx_; } - public static final int TAG_FIELD_NUMBER = 7; + public static final int TAG_FIELD_NUMBER = 10; private emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag tag_; /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; * @return Whether the tag field is set. */ @java.lang.Override @@ -160,7 +171,7 @@ public boolean hasTag() { return tag_ != null; } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; * @return The tag. */ @java.lang.Override @@ -168,13 +179,24 @@ public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardT return tag_ == null ? emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.getDefaultInstance() : tag_; } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ @java.lang.Override public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder getTagOrBuilder() { return getTag(); } + public static final int DEFAULT_REWARD_TYPE_FIELD_NUMBER = 12; + private int defaultRewardType_; + /** + * uint32 default_reward_type = 12; + * @return The defaultRewardType. + */ + @java.lang.Override + public int getDefaultRewardType() { + return defaultRewardType_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -189,11 +211,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (optionIdx_ != 0) { + output.writeUInt32(1, optionIdx_); + } if (tag_ != null) { - output.writeMessage(7, getTag()); + output.writeMessage(10, getTag()); } - if (optionIdx_ != 0) { - output.writeUInt32(14, optionIdx_); + if (defaultRewardType_ != 0) { + output.writeUInt32(12, defaultRewardType_); } unknownFields.writeTo(output); } @@ -204,13 +229,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (optionIdx_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(1, optionIdx_); + } if (tag_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, getTag()); + .computeMessageSize(10, getTag()); } - if (optionIdx_ != 0) { + if (defaultRewardType_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, optionIdx_); + .computeUInt32Size(12, defaultRewardType_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -234,6 +263,8 @@ public boolean equals(final java.lang.Object obj) { if (!getTag() .equals(other.getTag())) return false; } + if (getDefaultRewardType() + != other.getDefaultRewardType()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -251,6 +282,8 @@ public int hashCode() { hash = (37 * hash) + TAG_FIELD_NUMBER; hash = (53 * hash) + getTag().hashCode(); } + hash = (37 * hash) + DEFAULT_REWARD_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getDefaultRewardType(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -348,7 +381,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: ABOLHFADNBD
+     * obf: MIAMFOFPFNK
      *
* * Protobuf type {@code BattlePassRewardTakeOption} @@ -396,6 +429,8 @@ public Builder clear() { tag_ = null; tagBuilder_ = null; } + defaultRewardType_ = 0; + return this; } @@ -428,6 +463,7 @@ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass } else { result.tag_ = tagBuilder_.build(); } + result.defaultRewardType_ = defaultRewardType_; onBuilt(); return result; } @@ -482,6 +518,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassRewardTakeOptionOut if (other.hasTag()) { mergeTag(other.getTag()); } + if (other.getDefaultRewardType() != 0) { + setDefaultRewardType(other.getDefaultRewardType()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -513,7 +552,7 @@ public Builder mergeFrom( private int optionIdx_ ; /** - * uint32 option_idx = 14; + * uint32 option_idx = 1; * @return The optionIdx. */ @java.lang.Override @@ -521,7 +560,7 @@ public int getOptionIdx() { return optionIdx_; } /** - * uint32 option_idx = 14; + * uint32 option_idx = 1; * @param value The optionIdx to set. * @return This builder for chaining. */ @@ -532,7 +571,7 @@ public Builder setOptionIdx(int value) { return this; } /** - * uint32 option_idx = 14; + * uint32 option_idx = 1; * @return This builder for chaining. */ public Builder clearOptionIdx() { @@ -546,14 +585,14 @@ public Builder clearOptionIdx() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> tagBuilder_; /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; * @return Whether the tag field is set. */ public boolean hasTag() { return tagBuilder_ != null || tag_ != null; } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; * @return The tag. */ public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag getTag() { @@ -564,7 +603,7 @@ public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardT } } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ public Builder setTag(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag value) { if (tagBuilder_ == null) { @@ -580,7 +619,7 @@ public Builder setTag(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.Ba return this; } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ public Builder setTag( emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder builderForValue) { @@ -594,7 +633,7 @@ public Builder setTag( return this; } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ public Builder mergeTag(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag value) { if (tagBuilder_ == null) { @@ -612,7 +651,7 @@ public Builder mergeTag(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass. return this; } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ public Builder clearTag() { if (tagBuilder_ == null) { @@ -626,7 +665,7 @@ public Builder clearTag() { return this; } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder getTagBuilder() { @@ -634,7 +673,7 @@ public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardT return getTagFieldBuilder().getBuilder(); } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder getTagOrBuilder() { if (tagBuilder_ != null) { @@ -645,7 +684,7 @@ public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardT } } /** - * .BattlePassRewardTag tag = 7; + * .BattlePassRewardTag tag = 10; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> @@ -660,6 +699,37 @@ public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardT } return tagBuilder_; } + + private int defaultRewardType_ ; + /** + * uint32 default_reward_type = 12; + * @return The defaultRewardType. + */ + @java.lang.Override + public int getDefaultRewardType() { + return defaultRewardType_; + } + /** + * uint32 default_reward_type = 12; + * @param value The defaultRewardType to set. + * @return This builder for chaining. + */ + public Builder setDefaultRewardType(int value) { + + defaultRewardType_ = value; + onChanged(); + return this; + } + /** + * uint32 default_reward_type = 12; + * @return This builder for chaining. + */ + public Builder clearDefaultRewardType() { + + defaultRewardType_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -728,10 +798,11 @@ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass static { java.lang.String[] descriptorData = { "\n BattlePassRewardTakeOption.proto\032\031Batt" + - "lePassRewardTag.proto\"S\n\032BattlePassRewar" + - "dTakeOption\022\022\n\noption_idx\030\016 \001(\r\022!\n\003tag\030\007" + - " \001(\0132\024.BattlePassRewardTagB\033\n\031emu.grassc" + - "utter.net.protob\006proto3" + "lePassRewardTag.proto\"p\n\032BattlePassRewar" + + "dTakeOption\022\022\n\noption_idx\030\001 \001(\r\022!\n\003tag\030\n" + + " \001(\0132\024.BattlePassRewardTag\022\033\n\023default_re" + + "ward_type\030\014 \001(\rB\033\n\031emu.grasscutter.net.p" + + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -743,7 +814,7 @@ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass internal_static_BattlePassRewardTakeOption_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_BattlePassRewardTakeOption_descriptor, - new java.lang.String[] { "OptionIdx", "Tag", }); + new java.lang.String[] { "OptionIdx", "Tag", "DefaultRewardType", }); emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BladeDanceSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BladeDanceSettleInfoOuterClass.java index 7c691632cb1..3cced300cfc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/BladeDanceSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/BladeDanceSettleInfoOuterClass.java @@ -19,34 +19,30 @@ public interface BladeDanceSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_new_record = 15; - * @return The isNewRecord. + * uint32 JOFBEIACLOF = 2; + * @return The jOFBEIACLOF. */ - boolean getIsNewRecord(); + int getJOFBEIACLOF(); /** - * uint32 KDPNBLFJKND = 2; - * @return The kDPNBLFJKND. + * uint32 APAFIPOFLOJ = 7; + * @return The aPAFIPOFLOJ. */ - int getKDPNBLFJKND(); + int getAPAFIPOFLOJ(); /** - * uint32 cost_time = 10; - * @return The costTime. + * bool is_new_record = 10; + * @return The isNewRecord. */ - int getCostTime(); + boolean getIsNewRecord(); /** - * uint32 level_id = 12; - * @return The levelId. + * uint32 PJJAOILBFBN = 15; + * @return The pJJAOILBFBN. */ - int getLevelId(); + int getPJJAOILBFBN(); } /** - * 
-   * Obf: PPBHHGOECDC
-   *
- * * Protobuf type {@code BladeDanceSettleInfo} */ public static final class BladeDanceSettleInfo extends @@ -93,22 +89,22 @@ private BladeDanceSettleInfo( break; case 16: { - kDPNBLFJKND_ = input.readUInt32(); + jOFBEIACLOF_ = input.readUInt32(); break; } - case 80: { + case 56: { - costTime_ = input.readUInt32(); + aPAFIPOFLOJ_ = input.readUInt32(); break; } - case 96: { + case 80: { - levelId_ = input.readUInt32(); + isNewRecord_ = input.readBool(); break; } case 120: { - isNewRecord_ = input.readBool(); + pJJAOILBFBN_ = input.readUInt32(); break; } default: { @@ -143,48 +139,48 @@ private BladeDanceSettleInfo( emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.class, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder.class); } - public static final int IS_NEW_RECORD_FIELD_NUMBER = 15; - private boolean isNewRecord_; + public static final int JOFBEIACLOF_FIELD_NUMBER = 2; + private int jOFBEIACLOF_; /** - * bool is_new_record = 15; - * @return The isNewRecord. + * uint32 JOFBEIACLOF = 2; + * @return The jOFBEIACLOF. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getJOFBEIACLOF() { + return jOFBEIACLOF_; } - public static final int KDPNBLFJKND_FIELD_NUMBER = 2; - private int kDPNBLFJKND_; + public static final int APAFIPOFLOJ_FIELD_NUMBER = 7; + private int aPAFIPOFLOJ_; /** - * uint32 KDPNBLFJKND = 2; - * @return The kDPNBLFJKND. + * uint32 APAFIPOFLOJ = 7; + * @return The aPAFIPOFLOJ. */ @java.lang.Override - public int getKDPNBLFJKND() { - return kDPNBLFJKND_; + public int getAPAFIPOFLOJ() { + return aPAFIPOFLOJ_; } - public static final int COST_TIME_FIELD_NUMBER = 10; - private int costTime_; + public static final int IS_NEW_RECORD_FIELD_NUMBER = 10; + private boolean isNewRecord_; /** - * uint32 cost_time = 10; - * @return The costTime. + * bool is_new_record = 10; + * @return The isNewRecord. */ @java.lang.Override - public int getCostTime() { - return costTime_; + public boolean getIsNewRecord() { + return isNewRecord_; } - public static final int LEVEL_ID_FIELD_NUMBER = 12; - private int levelId_; + public static final int PJJAOILBFBN_FIELD_NUMBER = 15; + private int pJJAOILBFBN_; /** - * uint32 level_id = 12; - * @return The levelId. + * uint32 PJJAOILBFBN = 15; + * @return The pJJAOILBFBN. */ @java.lang.Override - public int getLevelId() { - return levelId_; + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } private byte memoizedIsInitialized = -1; @@ -201,17 +197,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (kDPNBLFJKND_ != 0) { - output.writeUInt32(2, kDPNBLFJKND_); - } - if (costTime_ != 0) { - output.writeUInt32(10, costTime_); + if (jOFBEIACLOF_ != 0) { + output.writeUInt32(2, jOFBEIACLOF_); } - if (levelId_ != 0) { - output.writeUInt32(12, levelId_); + if (aPAFIPOFLOJ_ != 0) { + output.writeUInt32(7, aPAFIPOFLOJ_); } if (isNewRecord_ != false) { - output.writeBool(15, isNewRecord_); + output.writeBool(10, isNewRecord_); + } + if (pJJAOILBFBN_ != 0) { + output.writeUInt32(15, pJJAOILBFBN_); } unknownFields.writeTo(output); } @@ -222,21 +218,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (kDPNBLFJKND_ != 0) { + if (jOFBEIACLOF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, kDPNBLFJKND_); + .computeUInt32Size(2, jOFBEIACLOF_); } - if (costTime_ != 0) { + if (aPAFIPOFLOJ_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, costTime_); + .computeUInt32Size(7, aPAFIPOFLOJ_); } - if (levelId_ != 0) { + if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, levelId_); + .computeBoolSize(10, isNewRecord_); } - if (isNewRecord_ != false) { + if (pJJAOILBFBN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(15, isNewRecord_); + .computeUInt32Size(15, pJJAOILBFBN_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -253,14 +249,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo other = (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) obj; + if (getJOFBEIACLOF() + != other.getJOFBEIACLOF()) return false; + if (getAPAFIPOFLOJ() + != other.getAPAFIPOFLOJ()) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; - if (getKDPNBLFJKND() - != other.getKDPNBLFJKND()) return false; - if (getCostTime() - != other.getCostTime()) return false; - if (getLevelId() - != other.getLevelId()) return false; + if (getPJJAOILBFBN() + != other.getPJJAOILBFBN()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -272,15 +268,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + JOFBEIACLOF_FIELD_NUMBER; + hash = (53 * hash) + getJOFBEIACLOF(); + hash = (37 * hash) + APAFIPOFLOJ_FIELD_NUMBER; + hash = (53 * hash) + getAPAFIPOFLOJ(); hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); - hash = (37 * hash) + KDPNBLFJKND_FIELD_NUMBER; - hash = (53 * hash) + getKDPNBLFJKND(); - hash = (37 * hash) + COST_TIME_FIELD_NUMBER; - hash = (53 * hash) + getCostTime(); - hash = (37 * hash) + LEVEL_ID_FIELD_NUMBER; - hash = (53 * hash) + getLevelId(); + hash = (37 * hash) + PJJAOILBFBN_FIELD_NUMBER; + hash = (53 * hash) + getPJJAOILBFBN(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -377,10 +373,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: PPBHHGOECDC
-     *
- * * Protobuf type {@code BladeDanceSettleInfo} */ public static final class Builder extends @@ -418,13 +410,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isNewRecord_ = false; + jOFBEIACLOF_ = 0; - kDPNBLFJKND_ = 0; + aPAFIPOFLOJ_ = 0; - costTime_ = 0; + isNewRecord_ = false; - levelId_ = 0; + pJJAOILBFBN_ = 0; return this; } @@ -452,10 +444,10 @@ public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettle @java.lang.Override public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo buildPartial() { emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo result = new emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo(this); + result.jOFBEIACLOF_ = jOFBEIACLOF_; + result.aPAFIPOFLOJ_ = aPAFIPOFLOJ_; result.isNewRecord_ = isNewRecord_; - result.kDPNBLFJKND_ = kDPNBLFJKND_; - result.costTime_ = costTime_; - result.levelId_ = levelId_; + result.pJJAOILBFBN_ = pJJAOILBFBN_; onBuilt(); return result; } @@ -504,17 +496,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo other) { if (other == emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance()) return this; - if (other.getIsNewRecord() != false) { - setIsNewRecord(other.getIsNewRecord()); + if (other.getJOFBEIACLOF() != 0) { + setJOFBEIACLOF(other.getJOFBEIACLOF()); } - if (other.getKDPNBLFJKND() != 0) { - setKDPNBLFJKND(other.getKDPNBLFJKND()); + if (other.getAPAFIPOFLOJ() != 0) { + setAPAFIPOFLOJ(other.getAPAFIPOFLOJ()); } - if (other.getCostTime() != 0) { - setCostTime(other.getCostTime()); + if (other.getIsNewRecord() != false) { + setIsNewRecord(other.getIsNewRecord()); } - if (other.getLevelId() != 0) { - setLevelId(other.getLevelId()); + if (other.getPJJAOILBFBN() != 0) { + setPJJAOILBFBN(other.getPJJAOILBFBN()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -545,126 +537,126 @@ public Builder mergeFrom( return this; } - private boolean isNewRecord_ ; + private int jOFBEIACLOF_ ; /** - * bool is_new_record = 15; - * @return The isNewRecord. + * uint32 JOFBEIACLOF = 2; + * @return The jOFBEIACLOF. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getJOFBEIACLOF() { + return jOFBEIACLOF_; } /** - * bool is_new_record = 15; - * @param value The isNewRecord to set. + * uint32 JOFBEIACLOF = 2; + * @param value The jOFBEIACLOF to set. * @return This builder for chaining. */ - public Builder setIsNewRecord(boolean value) { + public Builder setJOFBEIACLOF(int value) { - isNewRecord_ = value; + jOFBEIACLOF_ = value; onChanged(); return this; } /** - * bool is_new_record = 15; + * uint32 JOFBEIACLOF = 2; * @return This builder for chaining. */ - public Builder clearIsNewRecord() { + public Builder clearJOFBEIACLOF() { - isNewRecord_ = false; + jOFBEIACLOF_ = 0; onChanged(); return this; } - private int kDPNBLFJKND_ ; + private int aPAFIPOFLOJ_ ; /** - * uint32 KDPNBLFJKND = 2; - * @return The kDPNBLFJKND. + * uint32 APAFIPOFLOJ = 7; + * @return The aPAFIPOFLOJ. */ @java.lang.Override - public int getKDPNBLFJKND() { - return kDPNBLFJKND_; + public int getAPAFIPOFLOJ() { + return aPAFIPOFLOJ_; } /** - * uint32 KDPNBLFJKND = 2; - * @param value The kDPNBLFJKND to set. + * uint32 APAFIPOFLOJ = 7; + * @param value The aPAFIPOFLOJ to set. * @return This builder for chaining. */ - public Builder setKDPNBLFJKND(int value) { + public Builder setAPAFIPOFLOJ(int value) { - kDPNBLFJKND_ = value; + aPAFIPOFLOJ_ = value; onChanged(); return this; } /** - * uint32 KDPNBLFJKND = 2; + * uint32 APAFIPOFLOJ = 7; * @return This builder for chaining. */ - public Builder clearKDPNBLFJKND() { + public Builder clearAPAFIPOFLOJ() { - kDPNBLFJKND_ = 0; + aPAFIPOFLOJ_ = 0; onChanged(); return this; } - private int costTime_ ; + private boolean isNewRecord_ ; /** - * uint32 cost_time = 10; - * @return The costTime. + * bool is_new_record = 10; + * @return The isNewRecord. */ @java.lang.Override - public int getCostTime() { - return costTime_; + public boolean getIsNewRecord() { + return isNewRecord_; } /** - * uint32 cost_time = 10; - * @param value The costTime to set. + * bool is_new_record = 10; + * @param value The isNewRecord to set. * @return This builder for chaining. */ - public Builder setCostTime(int value) { + public Builder setIsNewRecord(boolean value) { - costTime_ = value; + isNewRecord_ = value; onChanged(); return this; } /** - * uint32 cost_time = 10; + * bool is_new_record = 10; * @return This builder for chaining. */ - public Builder clearCostTime() { + public Builder clearIsNewRecord() { - costTime_ = 0; + isNewRecord_ = false; onChanged(); return this; } - private int levelId_ ; + private int pJJAOILBFBN_ ; /** - * uint32 level_id = 12; - * @return The levelId. + * uint32 PJJAOILBFBN = 15; + * @return The pJJAOILBFBN. */ @java.lang.Override - public int getLevelId() { - return levelId_; + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } /** - * uint32 level_id = 12; - * @param value The levelId to set. + * uint32 PJJAOILBFBN = 15; + * @param value The pJJAOILBFBN to set. * @return This builder for chaining. */ - public Builder setLevelId(int value) { + public Builder setPJJAOILBFBN(int value) { - levelId_ = value; + pJJAOILBFBN_ = value; onChanged(); return this; } /** - * uint32 level_id = 12; + * uint32 PJJAOILBFBN = 15; * @return This builder for chaining. */ - public Builder clearLevelId() { + public Builder clearPJJAOILBFBN() { - levelId_ = 0; + pJJAOILBFBN_ = 0; onChanged(); return this; } @@ -735,11 +727,11 @@ public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettle descriptor; static { java.lang.String[] descriptorData = { - "\n\032BladeDanceSettleInfo.proto\"g\n\024BladeDan" + - "ceSettleInfo\022\025\n\ris_new_record\030\017 \001(\010\022\023\n\013K" + - "DPNBLFJKND\030\002 \001(\r\022\021\n\tcost_time\030\n \001(\r\022\020\n\010l" + - "evel_id\030\014 \001(\rB\033\n\031emu.grasscutter.net.pro" + - "tob\006proto3" + "\n\032BladeDanceSettleInfo.proto\"l\n\024BladeDan" + + "ceSettleInfo\022\023\n\013JOFBEIACLOF\030\002 \001(\r\022\023\n\013APA" + + "FIPOFLOJ\030\007 \001(\r\022\025\n\ris_new_record\030\n \001(\010\022\023\n" + + "\013PJJAOILBFBN\030\017 \001(\rB\033\n\031emu.grasscutter.ne" + + "t.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -750,7 +742,7 @@ public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettle internal_static_BladeDanceSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_BladeDanceSettleInfo_descriptor, - new java.lang.String[] { "IsNewRecord", "KDPNBLFJKND", "CostTime", "LevelId", }); + new java.lang.String[] { "JOFBEIACLOF", "APAFIPOFLOJ", "IsNewRecord", "PJJAOILBFBN", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoNotifyOuterClass.java index fc2b8005e15..944a2a61d3d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoNotifyOuterClass.java @@ -19,33 +19,32 @@ public interface BlossomBriefInfoNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ java.util.List getBriefInfoListList(); /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo getBriefInfoList(int index); /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ int getBriefInfoListCount(); /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ java.util.List getBriefInfoListOrBuilderList(); /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfoOrBuilder getBriefInfoListOrBuilder( int index); } /** * 
-   * CmdId: 29177
-   * Obf: GHNDODAOAJO
+   * CmdId: 26657
    *
* * Protobuf type {@code BlossomBriefInfoNotify} @@ -94,7 +93,7 @@ private BlossomBriefInfoNotify( case 0: done = true; break; - case 98: { + case 74: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { briefInfoList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -138,17 +137,17 @@ private BlossomBriefInfoNotify( emu.grasscutter.net.proto.BlossomBriefInfoNotifyOuterClass.BlossomBriefInfoNotify.class, emu.grasscutter.net.proto.BlossomBriefInfoNotifyOuterClass.BlossomBriefInfoNotify.Builder.class); } - public static final int BRIEF_INFO_LIST_FIELD_NUMBER = 12; + public static final int BRIEF_INFO_LIST_FIELD_NUMBER = 9; private java.util.List briefInfoList_; /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ @java.lang.Override public java.util.List getBriefInfoListList() { return briefInfoList_; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ @java.lang.Override public java.util.List @@ -156,21 +155,21 @@ public java.util.Listrepeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ @java.lang.Override public int getBriefInfoListCount() { return briefInfoList_.size(); } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ @java.lang.Override public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo getBriefInfoList(int index) { return briefInfoList_.get(index); } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ @java.lang.Override public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfoOrBuilder getBriefInfoListOrBuilder( @@ -193,7 +192,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < briefInfoList_.size(); i++) { - output.writeMessage(12, briefInfoList_.get(i)); + output.writeMessage(9, briefInfoList_.get(i)); } unknownFields.writeTo(output); } @@ -206,7 +205,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < briefInfoList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, briefInfoList_.get(i)); + .computeMessageSize(9, briefInfoList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -337,8 +336,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29177
-     * Obf: GHNDODAOAJO
+     * CmdId: 26657
      *
* * Protobuf type {@code BlossomBriefInfoNotify} @@ -538,7 +536,7 @@ private void ensureBriefInfoListIsMutable() { emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo, emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Builder, emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfoOrBuilder> briefInfoListBuilder_; /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public java.util.List getBriefInfoListList() { if (briefInfoListBuilder_ == null) { @@ -548,7 +546,7 @@ public java.util.Listrepeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public int getBriefInfoListCount() { if (briefInfoListBuilder_ == null) { @@ -558,7 +556,7 @@ public int getBriefInfoListCount() { } } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo getBriefInfoList(int index) { if (briefInfoListBuilder_ == null) { @@ -568,7 +566,7 @@ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo get } } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder setBriefInfoList( int index, emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo value) { @@ -585,7 +583,7 @@ public Builder setBriefInfoList( return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder setBriefInfoList( int index, emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Builder builderForValue) { @@ -599,7 +597,7 @@ public Builder setBriefInfoList( return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder addBriefInfoList(emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo value) { if (briefInfoListBuilder_ == null) { @@ -615,7 +613,7 @@ public Builder addBriefInfoList(emu.grasscutter.net.proto.BlossomBriefInfoOuterC return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder addBriefInfoList( int index, emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo value) { @@ -632,7 +630,7 @@ public Builder addBriefInfoList( return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder addBriefInfoList( emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Builder builderForValue) { @@ -646,7 +644,7 @@ public Builder addBriefInfoList( return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder addBriefInfoList( int index, emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Builder builderForValue) { @@ -660,7 +658,7 @@ public Builder addBriefInfoList( return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder addAllBriefInfoList( java.lang.Iterable values) { @@ -675,7 +673,7 @@ public Builder addAllBriefInfoList( return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder clearBriefInfoList() { if (briefInfoListBuilder_ == null) { @@ -688,7 +686,7 @@ public Builder clearBriefInfoList() { return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public Builder removeBriefInfoList(int index) { if (briefInfoListBuilder_ == null) { @@ -701,14 +699,14 @@ public Builder removeBriefInfoList(int index) { return this; } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Builder getBriefInfoListBuilder( int index) { return getBriefInfoListFieldBuilder().getBuilder(index); } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfoOrBuilder getBriefInfoListOrBuilder( int index) { @@ -718,7 +716,7 @@ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfoOrBu } } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public java.util.List getBriefInfoListOrBuilderList() { @@ -729,14 +727,14 @@ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfoOrBu } } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Builder addBriefInfoListBuilder() { return getBriefInfoListFieldBuilder().addBuilder( emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.getDefaultInstance()); } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Builder addBriefInfoListBuilder( int index) { @@ -744,7 +742,7 @@ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Bui index, emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.getDefaultInstance()); } /** - * repeated .BlossomBriefInfo brief_info_list = 12; + * repeated .BlossomBriefInfo brief_info_list = 9; */ public java.util.List getBriefInfoListBuilderList() { @@ -833,7 +831,7 @@ public emu.grasscutter.net.proto.BlossomBriefInfoNotifyOuterClass.BlossomBriefIn java.lang.String[] descriptorData = { "\n\034BlossomBriefInfoNotify.proto\032\026BlossomB" + "riefInfo.proto\"D\n\026BlossomBriefInfoNotify" + - "\022*\n\017brief_info_list\030\014 \003(\0132\021.BlossomBrief" + + "\022*\n\017brief_info_list\030\t \003(\0132\021.BlossomBrief" + "InfoB\033\n\031emu.grasscutter.net.protob\006proto" + "3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoOuterClass.java index 3b27fcc144e..925c0e3ec9f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/BlossomBriefInfoOuterClass.java @@ -19,83 +19,96 @@ public interface BlossomBriefInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 state = 10; - * @return The state. + * uint32 city_id = 1; + * @return The cityId. */ - int getState(); + int getCityId(); /** - * bool is_guide_opened = 5; - * @return The isGuideOpened. + * uint32 reward_id = 2; + * @return The rewardId. */ - boolean getIsGuideOpened(); + int getRewardId(); /** - * uint32 resin = 2; - * @return The resin. + * uint32 state = 3; + * @return The state. */ - int getResin(); + int getState(); /** - * uint32 circle_camp_id = 14; - * @return The circleCampId. + * .Vector pos = 4; + * @return Whether the pos field is set. */ - int getCircleCampId(); - + boolean hasPos(); /** - * uint32 monster_level = 12; - * @return The monsterLevel. + * .Vector pos = 4; + * @return The pos. */ - int getMonsterLevel(); - + emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); /** - * uint32 HJMMAOMEHOL = 8; - * @return The hJMMAOMEHOL. + * .Vector pos = 4; */ - int getHJMMAOMEHOL(); + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); /** - * uint32 scene_id = 13; - * @return The sceneId. + * uint32 resin = 5; + * @return The resin. */ - int getSceneId(); + int getResin(); /** - * uint32 refresh_id = 11; + * uint32 refresh_id = 6; * @return The refreshId. */ int getRefreshId(); /** - * uint32 reward_id = 7; - * @return The rewardId. + * bool is_guide_opened = 9; + * @return The isGuideOpened. */ - int getRewardId(); + boolean getIsGuideOpened(); /** - * .Vector pos = 15; - * @return Whether the pos field is set. + * uint32 scene_id = 10; + * @return The sceneId. */ - boolean hasPos(); + int getSceneId(); + /** - * .Vector pos = 15; - * @return The pos. + * 
+     * obf: HOGPDLGHGLM
+     *
+ * + * uint32 HOGPDLGHGLM = 11; + * @return The hOGPDLGHGLM. */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getPos(); + int getHOGPDLGHGLM(); + /** - * .Vector pos = 15; + * 
+     * obf: AGIENJJKPBE
+     *
+ * + * uint32 monster_level = 14; + * @return The monsterLevel. */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder(); + int getMonsterLevel(); /** - * uint32 city_id = 4; - * @return The cityId. + * 
+     * obf: CNIMHCGGFHE
+     *
+ * + * uint32 circle_camp_id = 15; + * @return The circleCampId. */ - int getCityId(); + int getCircleCampId(); } /** * 
-   * Obf: LHLCLOAIDOK
+   * 5.0.0
+   * obf: GFHBBBNOFAB
    *
* * Protobuf type {@code BlossomBriefInfo} @@ -142,67 +155,67 @@ private BlossomBriefInfo( case 0: done = true; break; - case 16: { - - resin_ = input.readUInt32(); - break; - } - case 32: { + case 8: { cityId_ = input.readUInt32(); break; } - case 40: { + case 16: { - isGuideOpened_ = input.readBool(); + rewardId_ = input.readUInt32(); break; } - case 56: { + case 24: { - rewardId_ = input.readUInt32(); + state_ = input.readUInt32(); break; } - case 64: { + case 34: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (pos_ != null) { + subBuilder = pos_.toBuilder(); + } + pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(pos_); + pos_ = subBuilder.buildPartial(); + } - hJMMAOMEHOL_ = input.readUInt32(); break; } - case 80: { + case 40: { - state_ = input.readUInt32(); + resin_ = input.readUInt32(); break; } - case 88: { + case 48: { refreshId_ = input.readUInt32(); break; } - case 96: { + case 72: { - monsterLevel_ = input.readUInt32(); + isGuideOpened_ = input.readBool(); break; } - case 104: { + case 80: { sceneId_ = input.readUInt32(); break; } + case 88: { + + hOGPDLGHGLM_ = input.readUInt32(); + break; + } case 112: { - circleCampId_ = input.readUInt32(); + monsterLevel_ = input.readUInt32(); break; } - case 122: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (pos_ != null) { - subBuilder = pos_.toBuilder(); - } - pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(pos_); - pos_ = subBuilder.buildPartial(); - } + case 120: { + circleCampId_ = input.readUInt32(); break; } default: { @@ -237,87 +250,80 @@ private BlossomBriefInfo( emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.class, emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.Builder.class); } - public static final int STATE_FIELD_NUMBER = 10; - private int state_; + public static final int CITY_ID_FIELD_NUMBER = 1; + private int cityId_; /** - * uint32 state = 10; - * @return The state. + * uint32 city_id = 1; + * @return The cityId. */ @java.lang.Override - public int getState() { - return state_; + public int getCityId() { + return cityId_; } - public static final int IS_GUIDE_OPENED_FIELD_NUMBER = 5; - private boolean isGuideOpened_; + public static final int REWARD_ID_FIELD_NUMBER = 2; + private int rewardId_; /** - * bool is_guide_opened = 5; - * @return The isGuideOpened. + * uint32 reward_id = 2; + * @return The rewardId. */ @java.lang.Override - public boolean getIsGuideOpened() { - return isGuideOpened_; + public int getRewardId() { + return rewardId_; } - public static final int RESIN_FIELD_NUMBER = 2; - private int resin_; + public static final int STATE_FIELD_NUMBER = 3; + private int state_; /** - * uint32 resin = 2; - * @return The resin. + * uint32 state = 3; + * @return The state. */ @java.lang.Override - public int getResin() { - return resin_; + public int getState() { + return state_; } - public static final int CIRCLE_CAMP_ID_FIELD_NUMBER = 14; - private int circleCampId_; + public static final int POS_FIELD_NUMBER = 4; + private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; /** - * uint32 circle_camp_id = 14; - * @return The circleCampId. + * .Vector pos = 4; + * @return Whether the pos field is set. */ @java.lang.Override - public int getCircleCampId() { - return circleCampId_; + public boolean hasPos() { + return pos_ != null; } - - public static final int MONSTER_LEVEL_FIELD_NUMBER = 12; - private int monsterLevel_; /** - * uint32 monster_level = 12; - * @return The monsterLevel. + * .Vector pos = 4; + * @return The pos. */ @java.lang.Override - public int getMonsterLevel() { - return monsterLevel_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { + return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; } - - public static final int HJMMAOMEHOL_FIELD_NUMBER = 8; - private int hJMMAOMEHOL_; /** - * uint32 HJMMAOMEHOL = 8; - * @return The hJMMAOMEHOL. + * .Vector pos = 4; */ @java.lang.Override - public int getHJMMAOMEHOL() { - return hJMMAOMEHOL_; + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { + return getPos(); } - public static final int SCENE_ID_FIELD_NUMBER = 13; - private int sceneId_; + public static final int RESIN_FIELD_NUMBER = 5; + private int resin_; /** - * uint32 scene_id = 13; - * @return The sceneId. + * uint32 resin = 5; + * @return The resin. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getResin() { + return resin_; } - public static final int REFRESH_ID_FIELD_NUMBER = 11; + public static final int REFRESH_ID_FIELD_NUMBER = 6; private int refreshId_; /** - * uint32 refresh_id = 11; + * uint32 refresh_id = 6; * @return The refreshId. */ @java.lang.Override @@ -325,52 +331,71 @@ public int getRefreshId() { return refreshId_; } - public static final int REWARD_ID_FIELD_NUMBER = 7; - private int rewardId_; + public static final int IS_GUIDE_OPENED_FIELD_NUMBER = 9; + private boolean isGuideOpened_; /** - * uint32 reward_id = 7; - * @return The rewardId. + * bool is_guide_opened = 9; + * @return The isGuideOpened. */ @java.lang.Override - public int getRewardId() { - return rewardId_; + public boolean getIsGuideOpened() { + return isGuideOpened_; } - public static final int POS_FIELD_NUMBER = 15; - private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; + public static final int SCENE_ID_FIELD_NUMBER = 10; + private int sceneId_; /** - * .Vector pos = 15; - * @return Whether the pos field is set. + * uint32 scene_id = 10; + * @return The sceneId. */ @java.lang.Override - public boolean hasPos() { - return pos_ != null; + public int getSceneId() { + return sceneId_; } + + public static final int HOGPDLGHGLM_FIELD_NUMBER = 11; + private int hOGPDLGHGLM_; /** - * .Vector pos = 15; - * @return The pos. + * 
+     * obf: HOGPDLGHGLM
+     *
+ * + * uint32 HOGPDLGHGLM = 11; + * @return The hOGPDLGHGLM. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { - return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + public int getHOGPDLGHGLM() { + return hOGPDLGHGLM_; } + + public static final int MONSTER_LEVEL_FIELD_NUMBER = 14; + private int monsterLevel_; /** - * .Vector pos = 15; + * 
+     * obf: AGIENJJKPBE
+     *
+ * + * uint32 monster_level = 14; + * @return The monsterLevel. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { - return getPos(); + public int getMonsterLevel() { + return monsterLevel_; } - public static final int CITY_ID_FIELD_NUMBER = 4; - private int cityId_; + public static final int CIRCLE_CAMP_ID_FIELD_NUMBER = 15; + private int circleCampId_; /** - * uint32 city_id = 4; - * @return The cityId. + * 
+     * obf: CNIMHCGGFHE
+     *
+ * + * uint32 circle_camp_id = 15; + * @return The circleCampId. */ @java.lang.Override - public int getCityId() { - return cityId_; + public int getCircleCampId() { + return circleCampId_; } private byte memoizedIsInitialized = -1; @@ -387,38 +412,38 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (resin_ != 0) { - output.writeUInt32(2, resin_); - } if (cityId_ != 0) { - output.writeUInt32(4, cityId_); - } - if (isGuideOpened_ != false) { - output.writeBool(5, isGuideOpened_); + output.writeUInt32(1, cityId_); } if (rewardId_ != 0) { - output.writeUInt32(7, rewardId_); - } - if (hJMMAOMEHOL_ != 0) { - output.writeUInt32(8, hJMMAOMEHOL_); + output.writeUInt32(2, rewardId_); } if (state_ != 0) { - output.writeUInt32(10, state_); + output.writeUInt32(3, state_); + } + if (pos_ != null) { + output.writeMessage(4, getPos()); + } + if (resin_ != 0) { + output.writeUInt32(5, resin_); } if (refreshId_ != 0) { - output.writeUInt32(11, refreshId_); + output.writeUInt32(6, refreshId_); } - if (monsterLevel_ != 0) { - output.writeUInt32(12, monsterLevel_); + if (isGuideOpened_ != false) { + output.writeBool(9, isGuideOpened_); } if (sceneId_ != 0) { - output.writeUInt32(13, sceneId_); + output.writeUInt32(10, sceneId_); } - if (circleCampId_ != 0) { - output.writeUInt32(14, circleCampId_); + if (hOGPDLGHGLM_ != 0) { + output.writeUInt32(11, hOGPDLGHGLM_); } - if (pos_ != null) { - output.writeMessage(15, getPos()); + if (monsterLevel_ != 0) { + output.writeUInt32(14, monsterLevel_); + } + if (circleCampId_ != 0) { + output.writeUInt32(15, circleCampId_); } unknownFields.writeTo(output); } @@ -429,49 +454,49 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (resin_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, resin_); - } if (cityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, cityId_); + .computeUInt32Size(1, cityId_); } - if (isGuideOpened_ != false) { + if (rewardId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(5, isGuideOpened_); + .computeUInt32Size(2, rewardId_); } - if (rewardId_ != 0) { + if (state_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, rewardId_); + .computeUInt32Size(3, state_); } - if (hJMMAOMEHOL_ != 0) { + if (pos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, hJMMAOMEHOL_); + .computeMessageSize(4, getPos()); } - if (state_ != 0) { + if (resin_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, state_); + .computeUInt32Size(5, resin_); } if (refreshId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, refreshId_); + .computeUInt32Size(6, refreshId_); } - if (monsterLevel_ != 0) { + if (isGuideOpened_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, monsterLevel_); + .computeBoolSize(9, isGuideOpened_); } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, sceneId_); + .computeUInt32Size(10, sceneId_); } - if (circleCampId_ != 0) { + if (hOGPDLGHGLM_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, circleCampId_); + .computeUInt32Size(11, hOGPDLGHGLM_); } - if (pos_ != null) { + if (monsterLevel_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(14, monsterLevel_); + } + if (circleCampId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, getPos()); + .computeUInt32Size(15, circleCampId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -488,67 +513,67 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo other = (emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo) obj; - if (getState() - != other.getState()) return false; - if (getIsGuideOpened() - != other.getIsGuideOpened()) return false; - if (getResin() - != other.getResin()) return false; - if (getCircleCampId() - != other.getCircleCampId()) return false; - if (getMonsterLevel() - != other.getMonsterLevel()) return false; - if (getHJMMAOMEHOL() - != other.getHJMMAOMEHOL()) return false; - if (getSceneId() - != other.getSceneId()) return false; - if (getRefreshId() - != other.getRefreshId()) return false; + if (getCityId() + != other.getCityId()) return false; if (getRewardId() != other.getRewardId()) return false; + if (getState() + != other.getState()) return false; if (hasPos() != other.hasPos()) return false; if (hasPos()) { if (!getPos() .equals(other.getPos())) return false; } - if (getCityId() - != other.getCityId()) return false; - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; + if (getResin() + != other.getResin()) return false; + if (getRefreshId() + != other.getRefreshId()) return false; + if (getIsGuideOpened() + != other.getIsGuideOpened()) return false; + if (getSceneId() + != other.getSceneId()) return false; + if (getHOGPDLGHGLM() + != other.getHOGPDLGHGLM()) return false; + if (getMonsterLevel() + != other.getMonsterLevel()) return false; + if (getCircleCampId() + != other.getCircleCampId()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + CITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getCityId(); + hash = (37 * hash) + REWARD_ID_FIELD_NUMBER; + hash = (53 * hash) + getRewardId(); hash = (37 * hash) + STATE_FIELD_NUMBER; hash = (53 * hash) + getState(); + if (hasPos()) { + hash = (37 * hash) + POS_FIELD_NUMBER; + hash = (53 * hash) + getPos().hashCode(); + } + hash = (37 * hash) + RESIN_FIELD_NUMBER; + hash = (53 * hash) + getResin(); + hash = (37 * hash) + REFRESH_ID_FIELD_NUMBER; + hash = (53 * hash) + getRefreshId(); hash = (37 * hash) + IS_GUIDE_OPENED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsGuideOpened()); - hash = (37 * hash) + RESIN_FIELD_NUMBER; - hash = (53 * hash) + getResin(); - hash = (37 * hash) + CIRCLE_CAMP_ID_FIELD_NUMBER; - hash = (53 * hash) + getCircleCampId(); - hash = (37 * hash) + MONSTER_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getMonsterLevel(); - hash = (37 * hash) + HJMMAOMEHOL_FIELD_NUMBER; - hash = (53 * hash) + getHJMMAOMEHOL(); hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); - hash = (37 * hash) + REFRESH_ID_FIELD_NUMBER; - hash = (53 * hash) + getRefreshId(); - hash = (37 * hash) + REWARD_ID_FIELD_NUMBER; - hash = (53 * hash) + getRewardId(); - if (hasPos()) { - hash = (37 * hash) + POS_FIELD_NUMBER; - hash = (53 * hash) + getPos().hashCode(); - } - hash = (37 * hash) + CITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getCityId(); + hash = (37 * hash) + HOGPDLGHGLM_FIELD_NUMBER; + hash = (53 * hash) + getHOGPDLGHGLM(); + hash = (37 * hash) + MONSTER_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getMonsterLevel(); + hash = (37 * hash) + CIRCLE_CAMP_ID_FIELD_NUMBER; + hash = (53 * hash) + getCircleCampId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -646,7 +671,8 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: LHLCLOAIDOK
+     * 5.0.0
+     * obf: GFHBBBNOFAB
      *
* * Protobuf type {@code BlossomBriefInfo} @@ -686,31 +712,31 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - state_ = 0; + cityId_ = 0; - isGuideOpened_ = false; + rewardId_ = 0; - resin_ = 0; + state_ = 0; - circleCampId_ = 0; + if (posBuilder_ == null) { + pos_ = null; + } else { + pos_ = null; + posBuilder_ = null; + } + resin_ = 0; - monsterLevel_ = 0; + refreshId_ = 0; - hJMMAOMEHOL_ = 0; + isGuideOpened_ = false; sceneId_ = 0; - refreshId_ = 0; + hOGPDLGHGLM_ = 0; - rewardId_ = 0; + monsterLevel_ = 0; - if (posBuilder_ == null) { - pos_ = null; - } else { - pos_ = null; - posBuilder_ = null; - } - cityId_ = 0; + circleCampId_ = 0; return this; } @@ -738,21 +764,21 @@ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo bui @java.lang.Override public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo buildPartial() { emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo result = new emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo(this); - result.state_ = state_; - result.isGuideOpened_ = isGuideOpened_; - result.resin_ = resin_; - result.circleCampId_ = circleCampId_; - result.monsterLevel_ = monsterLevel_; - result.hJMMAOMEHOL_ = hJMMAOMEHOL_; - result.sceneId_ = sceneId_; - result.refreshId_ = refreshId_; + result.cityId_ = cityId_; result.rewardId_ = rewardId_; + result.state_ = state_; if (posBuilder_ == null) { result.pos_ = pos_; } else { result.pos_ = posBuilder_.build(); } - result.cityId_ = cityId_; + result.resin_ = resin_; + result.refreshId_ = refreshId_; + result.isGuideOpened_ = isGuideOpened_; + result.sceneId_ = sceneId_; + result.hOGPDLGHGLM_ = hOGPDLGHGLM_; + result.monsterLevel_ = monsterLevel_; + result.circleCampId_ = circleCampId_; onBuilt(); return result; } @@ -801,38 +827,38 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo other) { if (other == emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo.getDefaultInstance()) return this; + if (other.getCityId() != 0) { + setCityId(other.getCityId()); + } + if (other.getRewardId() != 0) { + setRewardId(other.getRewardId()); + } if (other.getState() != 0) { setState(other.getState()); } - if (other.getIsGuideOpened() != false) { - setIsGuideOpened(other.getIsGuideOpened()); + if (other.hasPos()) { + mergePos(other.getPos()); } if (other.getResin() != 0) { setResin(other.getResin()); } - if (other.getCircleCampId() != 0) { - setCircleCampId(other.getCircleCampId()); - } - if (other.getMonsterLevel() != 0) { - setMonsterLevel(other.getMonsterLevel()); + if (other.getRefreshId() != 0) { + setRefreshId(other.getRefreshId()); } - if (other.getHJMMAOMEHOL() != 0) { - setHJMMAOMEHOL(other.getHJMMAOMEHOL()); + if (other.getIsGuideOpened() != false) { + setIsGuideOpened(other.getIsGuideOpened()); } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } - if (other.getRefreshId() != 0) { - setRefreshId(other.getRefreshId()); + if (other.getHOGPDLGHGLM() != 0) { + setHOGPDLGHGLM(other.getHOGPDLGHGLM()); } - if (other.getRewardId() != 0) { - setRewardId(other.getRewardId()); - } - if (other.hasPos()) { - mergePos(other.getPos()); + if (other.getMonsterLevel() != 0) { + setMonsterLevel(other.getMonsterLevel()); } - if (other.getCityId() != 0) { - setCityId(other.getCityId()); + if (other.getCircleCampId() != 0) { + setCircleCampId(other.getCircleCampId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -863,226 +889,252 @@ public Builder mergeFrom( return this; } - private int state_ ; + private int cityId_ ; /** - * uint32 state = 10; - * @return The state. + * uint32 city_id = 1; + * @return The cityId. */ @java.lang.Override - public int getState() { - return state_; + public int getCityId() { + return cityId_; } /** - * uint32 state = 10; - * @param value The state to set. + * uint32 city_id = 1; + * @param value The cityId to set. * @return This builder for chaining. */ - public Builder setState(int value) { + public Builder setCityId(int value) { - state_ = value; + cityId_ = value; onChanged(); return this; } /** - * uint32 state = 10; + * uint32 city_id = 1; * @return This builder for chaining. */ - public Builder clearState() { + public Builder clearCityId() { - state_ = 0; + cityId_ = 0; onChanged(); return this; } - private boolean isGuideOpened_ ; + private int rewardId_ ; /** - * bool is_guide_opened = 5; - * @return The isGuideOpened. + * uint32 reward_id = 2; + * @return The rewardId. */ @java.lang.Override - public boolean getIsGuideOpened() { - return isGuideOpened_; + public int getRewardId() { + return rewardId_; } /** - * bool is_guide_opened = 5; - * @param value The isGuideOpened to set. + * uint32 reward_id = 2; + * @param value The rewardId to set. * @return This builder for chaining. */ - public Builder setIsGuideOpened(boolean value) { + public Builder setRewardId(int value) { - isGuideOpened_ = value; + rewardId_ = value; onChanged(); return this; } /** - * bool is_guide_opened = 5; + * uint32 reward_id = 2; * @return This builder for chaining. */ - public Builder clearIsGuideOpened() { + public Builder clearRewardId() { - isGuideOpened_ = false; + rewardId_ = 0; onChanged(); return this; } - private int resin_ ; + private int state_ ; /** - * uint32 resin = 2; - * @return The resin. + * uint32 state = 3; + * @return The state. */ @java.lang.Override - public int getResin() { - return resin_; + public int getState() { + return state_; } /** - * uint32 resin = 2; - * @param value The resin to set. + * uint32 state = 3; + * @param value The state to set. * @return This builder for chaining. */ - public Builder setResin(int value) { + public Builder setState(int value) { - resin_ = value; + state_ = value; onChanged(); return this; } /** - * uint32 resin = 2; + * uint32 state = 3; * @return This builder for chaining. */ - public Builder clearResin() { + public Builder clearState() { - resin_ = 0; + state_ = 0; onChanged(); return this; } - private int circleCampId_ ; + private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; /** - * uint32 circle_camp_id = 14; - * @return The circleCampId. + * .Vector pos = 4; + * @return Whether the pos field is set. */ - @java.lang.Override - public int getCircleCampId() { - return circleCampId_; + public boolean hasPos() { + return posBuilder_ != null || pos_ != null; } /** - * uint32 circle_camp_id = 14; - * @param value The circleCampId to set. - * @return This builder for chaining. + * .Vector pos = 4; + * @return The pos. */ - public Builder setCircleCampId(int value) { - - circleCampId_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { + if (posBuilder_ == null) { + return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } else { + return posBuilder_.getMessage(); + } } /** - * uint32 circle_camp_id = 14; - * @return This builder for chaining. + * .Vector pos = 4; */ - public Builder clearCircleCampId() { - - circleCampId_ = 0; - onChanged(); + public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (posBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + pos_ = value; + onChanged(); + } else { + posBuilder_.setMessage(value); + } + return this; } - - private int monsterLevel_ ; /** - * uint32 monster_level = 12; - * @return The monsterLevel. + * .Vector pos = 4; */ - @java.lang.Override - public int getMonsterLevel() { - return monsterLevel_; + public Builder setPos( + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { + if (posBuilder_ == null) { + pos_ = builderForValue.build(); + onChanged(); + } else { + posBuilder_.setMessage(builderForValue.build()); + } + + return this; } /** - * uint32 monster_level = 12; - * @param value The monsterLevel to set. - * @return This builder for chaining. + * .Vector pos = 4; */ - public Builder setMonsterLevel(int value) { - - monsterLevel_ = value; - onChanged(); + public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { + if (posBuilder_ == null) { + if (pos_ != null) { + pos_ = + emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial(); + } else { + pos_ = value; + } + onChanged(); + } else { + posBuilder_.mergeFrom(value); + } + return this; } /** - * uint32 monster_level = 12; - * @return This builder for chaining. + * .Vector pos = 4; */ - public Builder clearMonsterLevel() { - - monsterLevel_ = 0; - onChanged(); + public Builder clearPos() { + if (posBuilder_ == null) { + pos_ = null; + onChanged(); + } else { + pos_ = null; + posBuilder_ = null; + } + return this; } - - private int hJMMAOMEHOL_ ; /** - * uint32 HJMMAOMEHOL = 8; - * @return The hJMMAOMEHOL. + * .Vector pos = 4; */ - @java.lang.Override - public int getHJMMAOMEHOL() { - return hJMMAOMEHOL_; + public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { + + onChanged(); + return getPosFieldBuilder().getBuilder(); } /** - * uint32 HJMMAOMEHOL = 8; - * @param value The hJMMAOMEHOL to set. - * @return This builder for chaining. + * .Vector pos = 4; */ - public Builder setHJMMAOMEHOL(int value) { - - hJMMAOMEHOL_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { + if (posBuilder_ != null) { + return posBuilder_.getMessageOrBuilder(); + } else { + return pos_ == null ? + emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; + } } /** - * uint32 HJMMAOMEHOL = 8; - * @return This builder for chaining. + * .Vector pos = 4; */ - public Builder clearHJMMAOMEHOL() { - - hJMMAOMEHOL_ = 0; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> + getPosFieldBuilder() { + if (posBuilder_ == null) { + posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( + getPos(), + getParentForChildren(), + isClean()); + pos_ = null; + } + return posBuilder_; } - private int sceneId_ ; + private int resin_ ; /** - * uint32 scene_id = 13; - * @return The sceneId. + * uint32 resin = 5; + * @return The resin. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getResin() { + return resin_; } /** - * uint32 scene_id = 13; - * @param value The sceneId to set. + * uint32 resin = 5; + * @param value The resin to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setResin(int value) { - sceneId_ = value; + resin_ = value; onChanged(); return this; } /** - * uint32 scene_id = 13; + * uint32 resin = 5; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearResin() { - sceneId_ = 0; + resin_ = 0; onChanged(); return this; } private int refreshId_ ; /** - * uint32 refresh_id = 11; + * uint32 refresh_id = 6; * @return The refreshId. */ @java.lang.Override @@ -1090,7 +1142,7 @@ public int getRefreshId() { return refreshId_; } /** - * uint32 refresh_id = 11; + * uint32 refresh_id = 6; * @param value The refreshId to set. * @return This builder for chaining. */ @@ -1101,7 +1153,7 @@ public Builder setRefreshId(int value) { return this; } /** - * uint32 refresh_id = 11; + * uint32 refresh_id = 6; * @return This builder for chaining. */ public Builder clearRefreshId() { @@ -1111,183 +1163,193 @@ public Builder clearRefreshId() { return this; } - private int rewardId_ ; + private boolean isGuideOpened_ ; /** - * uint32 reward_id = 7; - * @return The rewardId. + * bool is_guide_opened = 9; + * @return The isGuideOpened. */ @java.lang.Override - public int getRewardId() { - return rewardId_; + public boolean getIsGuideOpened() { + return isGuideOpened_; } /** - * uint32 reward_id = 7; - * @param value The rewardId to set. + * bool is_guide_opened = 9; + * @param value The isGuideOpened to set. * @return This builder for chaining. */ - public Builder setRewardId(int value) { + public Builder setIsGuideOpened(boolean value) { - rewardId_ = value; + isGuideOpened_ = value; onChanged(); return this; } /** - * uint32 reward_id = 7; + * bool is_guide_opened = 9; * @return This builder for chaining. */ - public Builder clearRewardId() { + public Builder clearIsGuideOpened() { - rewardId_ = 0; + isGuideOpened_ = false; onChanged(); return this; } - private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_; + private int sceneId_ ; /** - * .Vector pos = 15; - * @return Whether the pos field is set. + * uint32 scene_id = 10; + * @return The sceneId. */ - public boolean hasPos() { - return posBuilder_ != null || pos_ != null; + @java.lang.Override + public int getSceneId() { + return sceneId_; } /** - * .Vector pos = 15; - * @return The pos. + * uint32 scene_id = 10; + * @param value The sceneId to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() { - if (posBuilder_ == null) { - return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } else { - return posBuilder_.getMessage(); - } + public Builder setSceneId(int value) { + + sceneId_ = value; + onChanged(); + return this; } /** - * .Vector pos = 15; + * uint32 scene_id = 10; + * @return This builder for chaining. */ - public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (posBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - pos_ = value; - onChanged(); - } else { - posBuilder_.setMessage(value); - } - + public Builder clearSceneId() { + + sceneId_ = 0; + onChanged(); return this; } + + private int hOGPDLGHGLM_ ; /** - * .Vector pos = 15; + * 
+       * obf: HOGPDLGHGLM
+       *
+ * + * uint32 HOGPDLGHGLM = 11; + * @return The hOGPDLGHGLM. */ - public Builder setPos( - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { - if (posBuilder_ == null) { - pos_ = builderForValue.build(); - onChanged(); - } else { - posBuilder_.setMessage(builderForValue.build()); - } - - return this; + @java.lang.Override + public int getHOGPDLGHGLM() { + return hOGPDLGHGLM_; } /** - * .Vector pos = 15; + * 
+       * obf: HOGPDLGHGLM
+       *
+ * + * uint32 HOGPDLGHGLM = 11; + * @param value The hOGPDLGHGLM to set. + * @return This builder for chaining. */ - public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { - if (posBuilder_ == null) { - if (pos_ != null) { - pos_ = - emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial(); - } else { - pos_ = value; - } - onChanged(); - } else { - posBuilder_.mergeFrom(value); - } - + public Builder setHOGPDLGHGLM(int value) { + + hOGPDLGHGLM_ = value; + onChanged(); return this; } /** - * .Vector pos = 15; + * 
+       * obf: HOGPDLGHGLM
+       *
+ * + * uint32 HOGPDLGHGLM = 11; + * @return This builder for chaining. */ - public Builder clearPos() { - if (posBuilder_ == null) { - pos_ = null; - onChanged(); - } else { - pos_ = null; - posBuilder_ = null; - } - + public Builder clearHOGPDLGHGLM() { + + hOGPDLGHGLM_ = 0; + onChanged(); return this; } + + private int monsterLevel_ ; /** - * .Vector pos = 15; + * 
+       * obf: AGIENJJKPBE
+       *
+ * + * uint32 monster_level = 14; + * @return The monsterLevel. */ - public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() { - - onChanged(); - return getPosFieldBuilder().getBuilder(); + @java.lang.Override + public int getMonsterLevel() { + return monsterLevel_; } /** - * .Vector pos = 15; + * 
+       * obf: AGIENJJKPBE
+       *
+ * + * uint32 monster_level = 14; + * @param value The monsterLevel to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() { - if (posBuilder_ != null) { - return posBuilder_.getMessageOrBuilder(); - } else { - return pos_ == null ? - emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_; - } + public Builder setMonsterLevel(int value) { + + monsterLevel_ = value; + onChanged(); + return this; } /** - * .Vector pos = 15; + * 
+       * obf: AGIENJJKPBE
+       *
+ * + * uint32 monster_level = 14; + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> - getPosFieldBuilder() { - if (posBuilder_ == null) { - posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>( - getPos(), - getParentForChildren(), - isClean()); - pos_ = null; - } - return posBuilder_; + public Builder clearMonsterLevel() { + + monsterLevel_ = 0; + onChanged(); + return this; } - private int cityId_ ; + private int circleCampId_ ; /** - * uint32 city_id = 4; - * @return The cityId. + * 
+       * obf: CNIMHCGGFHE
+       *
+ * + * uint32 circle_camp_id = 15; + * @return The circleCampId. */ @java.lang.Override - public int getCityId() { - return cityId_; + public int getCircleCampId() { + return circleCampId_; } /** - * uint32 city_id = 4; - * @param value The cityId to set. + * 
+       * obf: CNIMHCGGFHE
+       *
+ * + * uint32 circle_camp_id = 15; + * @param value The circleCampId to set. * @return This builder for chaining. */ - public Builder setCityId(int value) { + public Builder setCircleCampId(int value) { - cityId_ = value; + circleCampId_ = value; onChanged(); return this; } /** - * uint32 city_id = 4; + * 
+       * obf: CNIMHCGGFHE
+       *
+ * + * uint32 circle_camp_id = 15; * @return This builder for chaining. */ - public Builder clearCityId() { + public Builder clearCircleCampId() { - cityId_ = 0; + circleCampId_ = 0; onChanged(); return this; } @@ -1359,12 +1421,12 @@ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo get static { java.lang.String[] descriptorData = { "\n\026BlossomBriefInfo.proto\032\014Vector.proto\"\355" + - "\001\n\020BlossomBriefInfo\022\r\n\005state\030\n \001(\r\022\027\n\017is" + - "_guide_opened\030\005 \001(\010\022\r\n\005resin\030\002 \001(\r\022\026\n\016ci" + - "rcle_camp_id\030\016 \001(\r\022\025\n\rmonster_level\030\014 \001(" + - "\r\022\023\n\013HJMMAOMEHOL\030\010 \001(\r\022\020\n\010scene_id\030\r \001(\r" + - "\022\022\n\nrefresh_id\030\013 \001(\r\022\021\n\treward_id\030\007 \001(\r\022" + - "\024\n\003pos\030\017 \001(\0132\007.Vector\022\017\n\007city_id\030\004 \001(\rB\033" + + "\001\n\020BlossomBriefInfo\022\017\n\007city_id\030\001 \001(\r\022\021\n\t" + + "reward_id\030\002 \001(\r\022\r\n\005state\030\003 \001(\r\022\024\n\003pos\030\004 " + + "\001(\0132\007.Vector\022\r\n\005resin\030\005 \001(\r\022\022\n\nrefresh_i" + + "d\030\006 \001(\r\022\027\n\017is_guide_opened\030\t \001(\010\022\020\n\010scen" + + "e_id\030\n \001(\r\022\023\n\013HOGPDLGHGLM\030\013 \001(\r\022\025\n\rmonst" + + "er_level\030\016 \001(\r\022\026\n\016circle_camp_id\030\017 \001(\rB\033" + "\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1377,7 +1439,7 @@ public emu.grasscutter.net.proto.BlossomBriefInfoOuterClass.BlossomBriefInfo get internal_static_BlossomBriefInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_BlossomBriefInfo_descriptor, - new java.lang.String[] { "State", "IsGuideOpened", "Resin", "CircleCampId", "MonsterLevel", "HJMMAOMEHOL", "SceneId", "RefreshId", "RewardId", "Pos", "CityId", }); + new java.lang.String[] { "CityId", "RewardId", "State", "Pos", "Resin", "RefreshId", "IsGuideOpened", "SceneId", "HOGPDLGHGLM", "MonsterLevel", "CircleCampId", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java index fb9051580d4..614ffc27cad 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java @@ -46,6 +46,11 @@ public interface BuyGoodsReqOrBuilder extends int getBuyCount(); } /** + * 
+   * CmdId: 4523
+   * obf: OAKJHCICNHN
+   *
+ * * Protobuf type {@code BuyGoodsReq} */ public static final class BuyGoodsReq extends @@ -376,6 +381,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 4523
+     * obf: OAKJHCICNHN
+     *
+ * * Protobuf type {@code BuyGoodsReq} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsRspOuterClass.java index 0e457a68739..6f234ac670e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsRspOuterClass.java @@ -76,6 +76,11 @@ emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrB int getShopType(); } /** + * 
+   * CmdId: 21
+   * obf: LODPCINKMNE
+   *
+ * * Protobuf type {@code BuyGoodsRsp} */ public static final class BuyGoodsRsp extends @@ -500,6 +505,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 21
+     * obf: LODPCINKMNE
+     *
+ * * Protobuf type {@code BuyGoodsRsp} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BuyResinRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BuyResinRspOuterClass.java index 131d077def6..e8d4094da51 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/BuyResinRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/BuyResinRspOuterClass.java @@ -19,21 +19,21 @@ public interface BuyResinRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 1; - * @return The retcode. + * uint32 cur_value = 2; + * @return The curValue. */ - int getRetcode(); + int getCurValue(); /** - * uint32 cur_value = 5; - * @return The curValue. + * int32 retcode = 3; + * @return The retcode. */ - int getCurValue(); + int getRetcode(); } /** * 
-   * CmdId: 3650
-   * Obf: MKMFMBMHOPG
+   * CmdId: 3981
+   * obf: CLCNDFCCBEG
    *
* * Protobuf type {@code BuyResinRsp} @@ -80,14 +80,14 @@ private BuyResinRsp( case 0: done = true; break; - case 8: { + case 16: { - retcode_ = input.readInt32(); + curValue_ = input.readUInt32(); break; } - case 40: { + case 24: { - curValue_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } default: { @@ -122,26 +122,26 @@ private BuyResinRsp( emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp.class, emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 1; - private int retcode_; + public static final int CUR_VALUE_FIELD_NUMBER = 2; + private int curValue_; /** - * int32 retcode = 1; - * @return The retcode. + * uint32 cur_value = 2; + * @return The curValue. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getCurValue() { + return curValue_; } - public static final int CUR_VALUE_FIELD_NUMBER = 5; - private int curValue_; + public static final int RETCODE_FIELD_NUMBER = 3; + private int retcode_; /** - * uint32 cur_value = 5; - * @return The curValue. + * int32 retcode = 3; + * @return The retcode. */ @java.lang.Override - public int getCurValue() { - return curValue_; + public int getRetcode() { + return retcode_; } private byte memoizedIsInitialized = -1; @@ -158,11 +158,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (retcode_ != 0) { - output.writeInt32(1, retcode_); - } if (curValue_ != 0) { - output.writeUInt32(5, curValue_); + output.writeUInt32(2, curValue_); + } + if (retcode_ != 0) { + output.writeInt32(3, retcode_); } unknownFields.writeTo(output); } @@ -173,13 +173,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { + if (curValue_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, retcode_); + .computeUInt32Size(2, curValue_); } - if (curValue_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, curValue_); + .computeInt32Size(3, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +196,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp other = (emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; if (getCurValue() != other.getCurValue()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +211,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + CUR_VALUE_FIELD_NUMBER; hash = (53 * hash) + getCurValue(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +312,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 3650
-     * Obf: MKMFMBMHOPG
+     * CmdId: 3981
+     * obf: CLCNDFCCBEG
      *
* * Protobuf type {@code BuyResinRsp} @@ -353,10 +353,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; - curValue_ = 0; + retcode_ = 0; + return this; } @@ -383,8 +383,8 @@ public emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp build() { @java.lang.Override public emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp buildPartial() { emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp result = new emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp(this); - result.retcode_ = retcode_; result.curValue_ = curValue_; + result.retcode_ = retcode_; onBuilt(); return result; } @@ -433,12 +433,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp other) { if (other == emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp.getDefaultInstance()) return this; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (other.getCurValue() != 0) { setCurValue(other.getCurValue()); } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +468,64 @@ public Builder mergeFrom( return this; } - private int retcode_ ; + private int curValue_ ; /** - * int32 retcode = 1; - * @return The retcode. + * uint32 cur_value = 2; + * @return The curValue. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getCurValue() { + return curValue_; } /** - * int32 retcode = 1; - * @param value The retcode to set. + * uint32 cur_value = 2; + * @param value The curValue to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setCurValue(int value) { - retcode_ = value; + curValue_ = value; onChanged(); return this; } /** - * int32 retcode = 1; + * uint32 cur_value = 2; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearCurValue() { - retcode_ = 0; + curValue_ = 0; onChanged(); return this; } - private int curValue_ ; + private int retcode_ ; /** - * uint32 cur_value = 5; - * @return The curValue. + * int32 retcode = 3; + * @return The retcode. */ @java.lang.Override - public int getCurValue() { - return curValue_; + public int getRetcode() { + return retcode_; } /** - * uint32 cur_value = 5; - * @param value The curValue to set. + * int32 retcode = 3; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setCurValue(int value) { + public Builder setRetcode(int value) { - curValue_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 cur_value = 5; + * int32 retcode = 3; * @return This builder for chaining. */ - public Builder clearCurValue() { + public Builder clearRetcode() { - curValue_ = 0; + retcode_ = 0; onChanged(); return this; } @@ -596,8 +596,8 @@ public emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp getDefaultIns descriptor; static { java.lang.String[] descriptorData = { - "\n\021BuyResinRsp.proto\"1\n\013BuyResinRsp\022\017\n\007re" + - "tcode\030\001 \001(\005\022\021\n\tcur_value\030\005 \001(\rB\033\n\031emu.gr" + + "\n\021BuyResinRsp.proto\"1\n\013BuyResinRsp\022\021\n\tcu" + + "r_value\030\002 \001(\r\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu.gr" + "asscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -609,7 +609,7 @@ public emu.grasscutter.net.proto.BuyResinRspOuterClass.BuyResinRsp getDefaultIns internal_static_BuyResinRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_BuyResinRsp_descriptor, - new java.lang.String[] { "Retcode", "CurValue", }); + new java.lang.String[] { "CurValue", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java index 244b8445a12..5727b490b10 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java @@ -66,6 +66,10 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamLis long getTargetWeaponGuid(); } /** + * 
+   * CmdId: 7713
+   *
+ * * Protobuf type {@code CalcWeaponUpgradeReturnItemsReq} */ public static final class CalcWeaponUpgradeReturnItemsReq extends @@ -463,6 +467,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 7713
+     *
+ * * Protobuf type {@code CalcWeaponUpgradeReturnItemsReq} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CardProductRewardNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CardProductRewardNotifyOuterClass.java index d6d73cb6f74..43b4217de26 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CardProductRewardNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CardProductRewardNotifyOuterClass.java @@ -19,33 +19,33 @@ public interface CardProductRewardNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * string product_id = 7; - * @return The productId. - */ - java.lang.String getProductId(); - /** - * string product_id = 7; - * @return The bytes for productId. + * uint32 remain_days = 4; + * @return The remainDays. */ - com.google.protobuf.ByteString - getProductIdBytes(); + int getRemainDays(); /** - * uint32 hcoin = 11; + * uint32 hcoin = 5; * @return The hcoin. */ int getHcoin(); /** - * uint32 remain_days = 4; - * @return The remainDays. + * string product_id = 10; + * @return The productId. */ - int getRemainDays(); + java.lang.String getProductId(); + /** + * string product_id = 10; + * @return The bytes for productId. + */ + com.google.protobuf.ByteString + getProductIdBytes(); } /** * 
-   * CmdId: 5635
-   * Obf: KHCOIEOAPAE
+   * CmdId: 4506
+   * obf: DLHFEMAMNMM
    *
* * Protobuf type {@code CardProductRewardNotify} @@ -98,15 +98,15 @@ private CardProductRewardNotify( remainDays_ = input.readUInt32(); break; } - case 58: { - java.lang.String s = input.readStringRequireUtf8(); + case 40: { - productId_ = s; + hcoin_ = input.readUInt32(); break; } - case 88: { + case 82: { + java.lang.String s = input.readStringRequireUtf8(); - hcoin_ = input.readUInt32(); + productId_ = s; break; } default: { @@ -141,10 +141,32 @@ private CardProductRewardNotify( emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify.class, emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify.Builder.class); } - public static final int PRODUCT_ID_FIELD_NUMBER = 7; + public static final int REMAIN_DAYS_FIELD_NUMBER = 4; + private int remainDays_; + /** + * uint32 remain_days = 4; + * @return The remainDays. + */ + @java.lang.Override + public int getRemainDays() { + return remainDays_; + } + + public static final int HCOIN_FIELD_NUMBER = 5; + private int hcoin_; + /** + * uint32 hcoin = 5; + * @return The hcoin. + */ + @java.lang.Override + public int getHcoin() { + return hcoin_; + } + + public static final int PRODUCT_ID_FIELD_NUMBER = 10; private volatile java.lang.Object productId_; /** - * string product_id = 7; + * string product_id = 10; * @return The productId. */ @java.lang.Override @@ -161,7 +183,7 @@ public java.lang.String getProductId() { } } /** - * string product_id = 7; + * string product_id = 10; * @return The bytes for productId. */ @java.lang.Override @@ -179,28 +201,6 @@ public java.lang.String getProductId() { } } - public static final int HCOIN_FIELD_NUMBER = 11; - private int hcoin_; - /** - * uint32 hcoin = 11; - * @return The hcoin. - */ - @java.lang.Override - public int getHcoin() { - return hcoin_; - } - - public static final int REMAIN_DAYS_FIELD_NUMBER = 4; - private int remainDays_; - /** - * uint32 remain_days = 4; - * @return The remainDays. - */ - @java.lang.Override - public int getRemainDays() { - return remainDays_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -218,11 +218,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (remainDays_ != 0) { output.writeUInt32(4, remainDays_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(productId_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, productId_); - } if (hcoin_ != 0) { - output.writeUInt32(11, hcoin_); + output.writeUInt32(5, hcoin_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(productId_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 10, productId_); } unknownFields.writeTo(output); } @@ -237,12 +237,12 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(4, remainDays_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(productId_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, productId_); - } if (hcoin_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, hcoin_); + .computeUInt32Size(5, hcoin_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(productId_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, productId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -259,12 +259,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify other = (emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify) obj; - if (!getProductId() - .equals(other.getProductId())) return false; - if (getHcoin() - != other.getHcoin()) return false; if (getRemainDays() != other.getRemainDays()) return false; + if (getHcoin() + != other.getHcoin()) return false; + if (!getProductId() + .equals(other.getProductId())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -276,12 +276,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PRODUCT_ID_FIELD_NUMBER; - hash = (53 * hash) + getProductId().hashCode(); - hash = (37 * hash) + HCOIN_FIELD_NUMBER; - hash = (53 * hash) + getHcoin(); hash = (37 * hash) + REMAIN_DAYS_FIELD_NUMBER; hash = (53 * hash) + getRemainDays(); + hash = (37 * hash) + HCOIN_FIELD_NUMBER; + hash = (53 * hash) + getHcoin(); + hash = (37 * hash) + PRODUCT_ID_FIELD_NUMBER; + hash = (53 * hash) + getProductId().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -379,8 +379,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5635
-     * Obf: KHCOIEOAPAE
+     * CmdId: 4506
+     * obf: DLHFEMAMNMM
      *
* * Protobuf type {@code CardProductRewardNotify} @@ -420,11 +420,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - productId_ = ""; + remainDays_ = 0; hcoin_ = 0; - remainDays_ = 0; + productId_ = ""; return this; } @@ -452,9 +452,9 @@ public emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRe @java.lang.Override public emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify buildPartial() { emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify result = new emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify(this); - result.productId_ = productId_; - result.hcoin_ = hcoin_; result.remainDays_ = remainDays_; + result.hcoin_ = hcoin_; + result.productId_ = productId_; onBuilt(); return result; } @@ -503,15 +503,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify other) { if (other == emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRewardNotify.getDefaultInstance()) return this; - if (!other.getProductId().isEmpty()) { - productId_ = other.productId_; - onChanged(); + if (other.getRemainDays() != 0) { + setRemainDays(other.getRemainDays()); } if (other.getHcoin() != 0) { setHcoin(other.getHcoin()); } - if (other.getRemainDays() != 0) { - setRemainDays(other.getRemainDays()); + if (!other.getProductId().isEmpty()) { + productId_ = other.productId_; + onChanged(); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -542,9 +542,71 @@ public Builder mergeFrom( return this; } + private int remainDays_ ; + /** + * uint32 remain_days = 4; + * @return The remainDays. + */ + @java.lang.Override + public int getRemainDays() { + return remainDays_; + } + /** + * uint32 remain_days = 4; + * @param value The remainDays to set. + * @return This builder for chaining. + */ + public Builder setRemainDays(int value) { + + remainDays_ = value; + onChanged(); + return this; + } + /** + * uint32 remain_days = 4; + * @return This builder for chaining. + */ + public Builder clearRemainDays() { + + remainDays_ = 0; + onChanged(); + return this; + } + + private int hcoin_ ; + /** + * uint32 hcoin = 5; + * @return The hcoin. + */ + @java.lang.Override + public int getHcoin() { + return hcoin_; + } + /** + * uint32 hcoin = 5; + * @param value The hcoin to set. + * @return This builder for chaining. + */ + public Builder setHcoin(int value) { + + hcoin_ = value; + onChanged(); + return this; + } + /** + * uint32 hcoin = 5; + * @return This builder for chaining. + */ + public Builder clearHcoin() { + + hcoin_ = 0; + onChanged(); + return this; + } + private java.lang.Object productId_ = ""; /** - * string product_id = 7; + * string product_id = 10; * @return The productId. */ public java.lang.String getProductId() { @@ -560,7 +622,7 @@ public java.lang.String getProductId() { } } /** - * string product_id = 7; + * string product_id = 10; * @return The bytes for productId. */ public com.google.protobuf.ByteString @@ -577,7 +639,7 @@ public java.lang.String getProductId() { } } /** - * string product_id = 7; + * string product_id = 10; * @param value The productId to set. * @return This builder for chaining. */ @@ -592,7 +654,7 @@ public Builder setProductId( return this; } /** - * string product_id = 7; + * string product_id = 10; * @return This builder for chaining. */ public Builder clearProductId() { @@ -602,7 +664,7 @@ public Builder clearProductId() { return this; } /** - * string product_id = 7; + * string product_id = 10; * @param value The bytes for productId to set. * @return This builder for chaining. */ @@ -617,68 +679,6 @@ public Builder setProductIdBytes( onChanged(); return this; } - - private int hcoin_ ; - /** - * uint32 hcoin = 11; - * @return The hcoin. - */ - @java.lang.Override - public int getHcoin() { - return hcoin_; - } - /** - * uint32 hcoin = 11; - * @param value The hcoin to set. - * @return This builder for chaining. - */ - public Builder setHcoin(int value) { - - hcoin_ = value; - onChanged(); - return this; - } - /** - * uint32 hcoin = 11; - * @return This builder for chaining. - */ - public Builder clearHcoin() { - - hcoin_ = 0; - onChanged(); - return this; - } - - private int remainDays_ ; - /** - * uint32 remain_days = 4; - * @return The remainDays. - */ - @java.lang.Override - public int getRemainDays() { - return remainDays_; - } - /** - * uint32 remain_days = 4; - * @param value The remainDays to set. - * @return This builder for chaining. - */ - public Builder setRemainDays(int value) { - - remainDays_ = value; - onChanged(); - return this; - } - /** - * uint32 remain_days = 4; - * @return This builder for chaining. - */ - public Builder clearRemainDays() { - - remainDays_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -747,8 +747,8 @@ public emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRe static { java.lang.String[] descriptorData = { "\n\035CardProductRewardNotify.proto\"Q\n\027CardP" + - "roductRewardNotify\022\022\n\nproduct_id\030\007 \001(\t\022\r" + - "\n\005hcoin\030\013 \001(\r\022\023\n\013remain_days\030\004 \001(\rB\033\n\031em" + + "roductRewardNotify\022\023\n\013remain_days\030\004 \001(\r\022" + + "\r\n\005hcoin\030\005 \001(\r\022\022\n\nproduct_id\030\n \001(\tB\033\n\031em" + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -760,7 +760,7 @@ public emu.grasscutter.net.proto.CardProductRewardNotifyOuterClass.CardProductRe internal_static_CardProductRewardNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CardProductRewardNotify_descriptor, - new java.lang.String[] { "ProductId", "Hcoin", "RemainDays", }); + new java.lang.String[] { "RemainDays", "Hcoin", "ProductId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeReqOuterClass.java index c5296daf69c..e0de2bbb8b7 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeReqOuterClass.java @@ -19,27 +19,27 @@ public interface ChangeGameTimeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_force_set = 1; - * @return The isForceSet. + * uint32 game_time = 15; + * @return The gameTime. */ - boolean getIsForceSet(); + int getGameTime(); /** - * uint32 extra_days = 7; + * uint32 extra_days = 11; * @return The extraDays. */ int getExtraDays(); /** - * uint32 game_time = 5; - * @return The gameTime. + * bool is_force_set = 8; + * @return The isForceSet. */ - int getGameTime(); + boolean getIsForceSet(); } /** * 
-   * CmdId: 27713
-   * Obf: OOLLNOHMPOL
+   * CmdId: 9437
+   * obf: CDPFMFBBFJP
    *
* * Protobuf type {@code ChangeGameTimeReq} @@ -86,19 +86,19 @@ private ChangeGameTimeReq( case 0: done = true; break; - case 8: { + case 64: { isForceSet_ = input.readBool(); break; } - case 40: { + case 88: { - gameTime_ = input.readUInt32(); + extraDays_ = input.readUInt32(); break; } - case 56: { + case 120: { - extraDays_ = input.readUInt32(); + gameTime_ = input.readUInt32(); break; } default: { @@ -133,21 +133,21 @@ private ChangeGameTimeReq( emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.class, emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.Builder.class); } - public static final int IS_FORCE_SET_FIELD_NUMBER = 1; - private boolean isForceSet_; + public static final int GAME_TIME_FIELD_NUMBER = 15; + private int gameTime_; /** - * bool is_force_set = 1; - * @return The isForceSet. + * uint32 game_time = 15; + * @return The gameTime. */ @java.lang.Override - public boolean getIsForceSet() { - return isForceSet_; + public int getGameTime() { + return gameTime_; } - public static final int EXTRA_DAYS_FIELD_NUMBER = 7; + public static final int EXTRA_DAYS_FIELD_NUMBER = 11; private int extraDays_; /** - * uint32 extra_days = 7; + * uint32 extra_days = 11; * @return The extraDays. */ @java.lang.Override @@ -155,15 +155,15 @@ public int getExtraDays() { return extraDays_; } - public static final int GAME_TIME_FIELD_NUMBER = 5; - private int gameTime_; + public static final int IS_FORCE_SET_FIELD_NUMBER = 8; + private boolean isForceSet_; /** - * uint32 game_time = 5; - * @return The gameTime. + * bool is_force_set = 8; + * @return The isForceSet. */ @java.lang.Override - public int getGameTime() { - return gameTime_; + public boolean getIsForceSet() { + return isForceSet_; } private byte memoizedIsInitialized = -1; @@ -181,13 +181,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (isForceSet_ != false) { - output.writeBool(1, isForceSet_); - } - if (gameTime_ != 0) { - output.writeUInt32(5, gameTime_); + output.writeBool(8, isForceSet_); } if (extraDays_ != 0) { - output.writeUInt32(7, extraDays_); + output.writeUInt32(11, extraDays_); + } + if (gameTime_ != 0) { + output.writeUInt32(15, gameTime_); } unknownFields.writeTo(output); } @@ -200,15 +200,15 @@ public int getSerializedSize() { size = 0; if (isForceSet_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, isForceSet_); + .computeBoolSize(8, isForceSet_); } - if (gameTime_ != 0) { + if (extraDays_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, gameTime_); + .computeUInt32Size(11, extraDays_); } - if (extraDays_ != 0) { + if (gameTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, extraDays_); + .computeUInt32Size(15, gameTime_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +225,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq other = (emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq) obj; - if (getIsForceSet() - != other.getIsForceSet()) return false; - if (getExtraDays() - != other.getExtraDays()) return false; if (getGameTime() != other.getGameTime()) return false; + if (getExtraDays() + != other.getExtraDays()) return false; + if (getIsForceSet() + != other.getIsForceSet()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,13 +242,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + GAME_TIME_FIELD_NUMBER; + hash = (53 * hash) + getGameTime(); + hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER; + hash = (53 * hash) + getExtraDays(); hash = (37 * hash) + IS_FORCE_SET_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsForceSet()); - hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER; - hash = (53 * hash) + getExtraDays(); - hash = (37 * hash) + GAME_TIME_FIELD_NUMBER; - hash = (53 * hash) + getGameTime(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -346,8 +346,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27713
-     * Obf: OOLLNOHMPOL
+     * CmdId: 9437
+     * obf: CDPFMFBBFJP
      *
* * Protobuf type {@code ChangeGameTimeReq} @@ -387,11 +387,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isForceSet_ = false; + gameTime_ = 0; extraDays_ = 0; - gameTime_ = 0; + isForceSet_ = false; return this; } @@ -419,9 +419,9 @@ public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq b @java.lang.Override public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq buildPartial() { emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq result = new emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq(this); - result.isForceSet_ = isForceSet_; - result.extraDays_ = extraDays_; result.gameTime_ = gameTime_; + result.extraDays_ = extraDays_; + result.isForceSet_ = isForceSet_; onBuilt(); return result; } @@ -470,14 +470,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq other) { if (other == emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.getDefaultInstance()) return this; - if (other.getIsForceSet() != false) { - setIsForceSet(other.getIsForceSet()); + if (other.getGameTime() != 0) { + setGameTime(other.getGameTime()); } if (other.getExtraDays() != 0) { setExtraDays(other.getExtraDays()); } - if (other.getGameTime() != 0) { - setGameTime(other.getGameTime()); + if (other.getIsForceSet() != false) { + setIsForceSet(other.getIsForceSet()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -508,40 +508,40 @@ public Builder mergeFrom( return this; } - private boolean isForceSet_ ; + private int gameTime_ ; /** - * bool is_force_set = 1; - * @return The isForceSet. + * uint32 game_time = 15; + * @return The gameTime. */ @java.lang.Override - public boolean getIsForceSet() { - return isForceSet_; + public int getGameTime() { + return gameTime_; } /** - * bool is_force_set = 1; - * @param value The isForceSet to set. + * uint32 game_time = 15; + * @param value The gameTime to set. * @return This builder for chaining. */ - public Builder setIsForceSet(boolean value) { + public Builder setGameTime(int value) { - isForceSet_ = value; + gameTime_ = value; onChanged(); return this; } /** - * bool is_force_set = 1; + * uint32 game_time = 15; * @return This builder for chaining. */ - public Builder clearIsForceSet() { + public Builder clearGameTime() { - isForceSet_ = false; + gameTime_ = 0; onChanged(); return this; } private int extraDays_ ; /** - * uint32 extra_days = 7; + * uint32 extra_days = 11; * @return The extraDays. */ @java.lang.Override @@ -549,7 +549,7 @@ public int getExtraDays() { return extraDays_; } /** - * uint32 extra_days = 7; + * uint32 extra_days = 11; * @param value The extraDays to set. * @return This builder for chaining. */ @@ -560,7 +560,7 @@ public Builder setExtraDays(int value) { return this; } /** - * uint32 extra_days = 7; + * uint32 extra_days = 11; * @return This builder for chaining. */ public Builder clearExtraDays() { @@ -570,33 +570,33 @@ public Builder clearExtraDays() { return this; } - private int gameTime_ ; + private boolean isForceSet_ ; /** - * uint32 game_time = 5; - * @return The gameTime. + * bool is_force_set = 8; + * @return The isForceSet. */ @java.lang.Override - public int getGameTime() { - return gameTime_; + public boolean getIsForceSet() { + return isForceSet_; } /** - * uint32 game_time = 5; - * @param value The gameTime to set. + * bool is_force_set = 8; + * @param value The isForceSet to set. * @return This builder for chaining. */ - public Builder setGameTime(int value) { + public Builder setIsForceSet(boolean value) { - gameTime_ = value; + isForceSet_ = value; onChanged(); return this; } /** - * uint32 game_time = 5; + * bool is_force_set = 8; * @return This builder for chaining. */ - public Builder clearGameTime() { + public Builder clearIsForceSet() { - gameTime_ = 0; + isForceSet_ = false; onChanged(); return this; } @@ -668,8 +668,8 @@ public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq g static { java.lang.String[] descriptorData = { "\n\027ChangeGameTimeReq.proto\"P\n\021ChangeGameT" + - "imeReq\022\024\n\014is_force_set\030\001 \001(\010\022\022\n\nextra_da" + - "ys\030\007 \001(\r\022\021\n\tgame_time\030\005 \001(\rB\033\n\031emu.grass" + + "imeReq\022\021\n\tgame_time\030\017 \001(\r\022\022\n\nextra_days\030" + + "\013 \001(\r\022\024\n\014is_force_set\030\010 \001(\010B\033\n\031emu.grass" + "cutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +681,7 @@ public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq g internal_static_ChangeGameTimeReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ChangeGameTimeReq_descriptor, - new java.lang.String[] { "IsForceSet", "ExtraDays", "GameTime", }); + new java.lang.String[] { "GameTime", "ExtraDays", "IsForceSet", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeRspOuterClass.java index f53b6c504d6..559a632756a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeRspOuterClass.java @@ -19,27 +19,27 @@ public interface ChangeGameTimeRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 cur_game_time = 1; + * uint32 cur_game_time = 2; * @return The curGameTime. */ int getCurGameTime(); /** - * uint32 extra_days = 14; - * @return The extraDays. + * int32 retcode = 4; + * @return The retcode. */ - int getExtraDays(); + int getRetcode(); /** - * int32 retcode = 13; - * @return The retcode. + * uint32 extra_days = 7; + * @return The extraDays. */ - int getRetcode(); + int getExtraDays(); } /** * 
-   * CmdId: 28316
-   * Obf: BEHKLPMPHBH
+   * CmdId: 29694
+   * obf: IHFDBFNLBJH
    *
* * Protobuf type {@code ChangeGameTimeRsp} @@ -86,17 +86,17 @@ private ChangeGameTimeRsp( case 0: done = true; break; - case 8: { + case 16: { curGameTime_ = input.readUInt32(); break; } - case 104: { + case 32: { retcode_ = input.readInt32(); break; } - case 112: { + case 56: { extraDays_ = input.readUInt32(); break; @@ -133,10 +133,10 @@ private ChangeGameTimeRsp( emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp.class, emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp.Builder.class); } - public static final int CUR_GAME_TIME_FIELD_NUMBER = 1; + public static final int CUR_GAME_TIME_FIELD_NUMBER = 2; private int curGameTime_; /** - * uint32 cur_game_time = 1; + * uint32 cur_game_time = 2; * @return The curGameTime. */ @java.lang.Override @@ -144,26 +144,26 @@ public int getCurGameTime() { return curGameTime_; } - public static final int EXTRA_DAYS_FIELD_NUMBER = 14; - private int extraDays_; + public static final int RETCODE_FIELD_NUMBER = 4; + private int retcode_; /** - * uint32 extra_days = 14; - * @return The extraDays. + * int32 retcode = 4; + * @return The retcode. */ @java.lang.Override - public int getExtraDays() { - return extraDays_; + public int getRetcode() { + return retcode_; } - public static final int RETCODE_FIELD_NUMBER = 13; - private int retcode_; + public static final int EXTRA_DAYS_FIELD_NUMBER = 7; + private int extraDays_; /** - * int32 retcode = 13; - * @return The retcode. + * uint32 extra_days = 7; + * @return The extraDays. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getExtraDays() { + return extraDays_; } private byte memoizedIsInitialized = -1; @@ -181,13 +181,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (curGameTime_ != 0) { - output.writeUInt32(1, curGameTime_); + output.writeUInt32(2, curGameTime_); } if (retcode_ != 0) { - output.writeInt32(13, retcode_); + output.writeInt32(4, retcode_); } if (extraDays_ != 0) { - output.writeUInt32(14, extraDays_); + output.writeUInt32(7, extraDays_); } unknownFields.writeTo(output); } @@ -200,15 +200,15 @@ public int getSerializedSize() { size = 0; if (curGameTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, curGameTime_); + .computeUInt32Size(2, curGameTime_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(13, retcode_); + .computeInt32Size(4, retcode_); } if (extraDays_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, extraDays_); + .computeUInt32Size(7, extraDays_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -227,10 +227,10 @@ public boolean equals(final java.lang.Object obj) { if (getCurGameTime() != other.getCurGameTime()) return false; - if (getExtraDays() - != other.getExtraDays()) return false; if (getRetcode() != other.getRetcode()) return false; + if (getExtraDays() + != other.getExtraDays()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -244,10 +244,10 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + CUR_GAME_TIME_FIELD_NUMBER; hash = (53 * hash) + getCurGameTime(); - hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER; - hash = (53 * hash) + getExtraDays(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER; + hash = (53 * hash) + getExtraDays(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28316
-     * Obf: BEHKLPMPHBH
+     * CmdId: 29694
+     * obf: IHFDBFNLBJH
      *
* * Protobuf type {@code ChangeGameTimeRsp} @@ -388,10 +388,10 @@ public Builder clear() { super.clear(); curGameTime_ = 0; - extraDays_ = 0; - retcode_ = 0; + extraDays_ = 0; + return this; } @@ -419,8 +419,8 @@ public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp b public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp buildPartial() { emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp result = new emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp(this); result.curGameTime_ = curGameTime_; - result.extraDays_ = extraDays_; result.retcode_ = retcode_; + result.extraDays_ = extraDays_; onBuilt(); return result; } @@ -472,12 +472,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.C if (other.getCurGameTime() != 0) { setCurGameTime(other.getCurGameTime()); } - if (other.getExtraDays() != 0) { - setExtraDays(other.getExtraDays()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } + if (other.getExtraDays() != 0) { + setExtraDays(other.getExtraDays()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -509,7 +509,7 @@ public Builder mergeFrom( private int curGameTime_ ; /** - * uint32 cur_game_time = 1; + * uint32 cur_game_time = 2; * @return The curGameTime. */ @java.lang.Override @@ -517,7 +517,7 @@ public int getCurGameTime() { return curGameTime_; } /** - * uint32 cur_game_time = 1; + * uint32 cur_game_time = 2; * @param value The curGameTime to set. * @return This builder for chaining. */ @@ -528,7 +528,7 @@ public Builder setCurGameTime(int value) { return this; } /** - * uint32 cur_game_time = 1; + * uint32 cur_game_time = 2; * @return This builder for chaining. */ public Builder clearCurGameTime() { @@ -538,64 +538,64 @@ public Builder clearCurGameTime() { return this; } - private int extraDays_ ; + private int retcode_ ; /** - * uint32 extra_days = 14; - * @return The extraDays. + * int32 retcode = 4; + * @return The retcode. */ @java.lang.Override - public int getExtraDays() { - return extraDays_; + public int getRetcode() { + return retcode_; } /** - * uint32 extra_days = 14; - * @param value The extraDays to set. + * int32 retcode = 4; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setExtraDays(int value) { + public Builder setRetcode(int value) { - extraDays_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 extra_days = 14; + * int32 retcode = 4; * @return This builder for chaining. */ - public Builder clearExtraDays() { + public Builder clearRetcode() { - extraDays_ = 0; + retcode_ = 0; onChanged(); return this; } - private int retcode_ ; + private int extraDays_ ; /** - * int32 retcode = 13; - * @return The retcode. + * uint32 extra_days = 7; + * @return The extraDays. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getExtraDays() { + return extraDays_; } /** - * int32 retcode = 13; - * @param value The retcode to set. + * uint32 extra_days = 7; + * @param value The extraDays to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setExtraDays(int value) { - retcode_ = value; + extraDays_ = value; onChanged(); return this; } /** - * int32 retcode = 13; + * uint32 extra_days = 7; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearExtraDays() { - retcode_ = 0; + extraDays_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp g static { java.lang.String[] descriptorData = { "\n\027ChangeGameTimeRsp.proto\"O\n\021ChangeGameT" + - "imeRsp\022\025\n\rcur_game_time\030\001 \001(\r\022\022\n\nextra_d" + - "ays\030\016 \001(\r\022\017\n\007retcode\030\r \001(\005B\033\n\031emu.grassc" + + "imeRsp\022\025\n\rcur_game_time\030\002 \001(\r\022\017\n\007retcode" + + "\030\004 \001(\005\022\022\n\nextra_days\030\007 \001(\rB\033\n\031emu.grassc" + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp g internal_static_ChangeGameTimeRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ChangeGameTimeRsp_descriptor, - new java.lang.String[] { "CurGameTime", "ExtraDays", "Retcode", }); + new java.lang.String[] { "CurGameTime", "Retcode", "ExtraDays", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpDebtsOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpDebtsOuterClass.java index 11aa3ef1dd4..f15680a7e65 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpDebtsOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpDebtsOuterClass.java @@ -40,9 +40,9 @@ public enum ChangeHpDebts */ CHANGE_HP_DEBTS_REDUCE_ABILITY(41), /** - * CHANGE_HP_DEBTS_ADDABILITY = 51; + * CHANGE_HP_DEBTS_ADDABILiTY = 51; */ - CHANGE_HP_DEBTS_ADDABILITY(51), + CHANGE_HP_DEBTS_ADDABILiTY(51), UNRECOGNIZED(-1), ; @@ -67,9 +67,9 @@ public enum ChangeHpDebts */ public static final int CHANGE_HP_DEBTS_REDUCE_ABILITY_VALUE = 41; /** - * CHANGE_HP_DEBTS_ADDABILITY = 51; + * CHANGE_HP_DEBTS_ADDABILiTY = 51; */ - public static final int CHANGE_HP_DEBTS_ADDABILITY_VALUE = 51; + public static final int CHANGE_HP_DEBTS_ADDABILiTY_VALUE = 51; public final int getNumber() { @@ -101,7 +101,7 @@ public static ChangeHpDebts forNumber(int value) { case 2: return CHANGE_HP_DEBTS_PAYFINISH; case 21: return CHANGE_HP_DEBTS_CLEAR; case 41: return CHANGE_HP_DEBTS_REDUCE_ABILITY; - case 51: return CHANGE_HP_DEBTS_ADDABILITY; + case 51: return CHANGE_HP_DEBTS_ADDABILiTY; default: return null; } } @@ -172,7 +172,7 @@ private ChangeHpDebts(int value) { "EBTS_PAY\020\001\022\035\n\031CHANGE_HP_DEBTS_PAYFINISH\020" + "\002\022\031\n\025CHANGE_HP_DEBTS_CLEAR\020\025\022\"\n\036CHANGE_H" + "P_DEBTS_REDUCE_ABILITY\020)\022\036\n\032CHANGE_HP_DE" + - "BTS_ADDABILITY\0203B\033\n\031emu.grasscutter.net." + + "BTS_ADDABILiTY\0203B\033\n\031emu.grasscutter.net." + "protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpReasonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpReasonOuterClass.java index bf5d93d88d8..367faf04350 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpReasonOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpReasonOuterClass.java @@ -20,272 +20,296 @@ public static void registerAllExtensions( public enum ChangeHpReason implements com.google.protobuf.ProtocolMessageEnum { /** - * CHANGE_HP_REASON_NONE = 0; + * CHANGE_HP_NONE = 0; */ - CHANGE_HP_REASON_NONE(0), + CHANGE_HP_NONE(0), /** - * CHANGE_HP_REASON_SUB_AVATAR = 1; + * CHANGE_HP_SUB_AVATAR = 1; */ - CHANGE_HP_REASON_SUB_AVATAR(1), + CHANGE_HP_SUB_AVATAR(1), /** - * CHANGE_HP_REASON_SUB_MONSTER = 2; + * CHANGE_HP_SUB_MONSTER = 2; */ - CHANGE_HP_REASON_SUB_MONSTER(2), + CHANGE_HP_SUB_MONSTER(2), /** - * CHANGE_HP_REASON_SUB_GEAR = 3; + * CHANGE_HP_SUB_GEAR = 3; */ - CHANGE_HP_REASON_SUB_GEAR(3), + CHANGE_HP_SUB_GEAR(3), /** - * CHANGE_HP_REASON_SUB_ENVIR = 4; + * CHANGE_HP_SUB_ENVIR = 4; */ - CHANGE_HP_REASON_SUB_ENVIR(4), + CHANGE_HP_SUB_ENVIR(4), /** - * CHANGE_HP_REASON_SUB_FALL = 5; + * CHANGE_HP_SUB_FALL = 5; */ - CHANGE_HP_REASON_SUB_FALL(5), + CHANGE_HP_SUB_FALL(5), /** - * CHANGE_HP_REASON_SUB_DRAWN = 6; + * CHANGE_HP_SUB_DRAWN = 6; */ - CHANGE_HP_REASON_SUB_DRAWN(6), + CHANGE_HP_SUB_DRAWN(6), /** - * CHANGE_HP_REASON_SUB_ABYSS = 7; + * CHANGE_HP_SUB_ABYSS = 7; */ - CHANGE_HP_REASON_SUB_ABYSS(7), + CHANGE_HP_SUB_ABYSS(7), /** - * CHANGE_HP_REASON_SUB_ABILITY = 8; + * CHANGE_HP_SUB_ABILITY = 8; */ - CHANGE_HP_REASON_SUB_ABILITY(8), + CHANGE_HP_SUB_ABILITY(8), /** - * CHANGE_HP_REASON_SUB_SUMMON = 9; + * CHANGE_HP_SUB_SUMMON = 9; */ - CHANGE_HP_REASON_SUB_SUMMON(9), + CHANGE_HP_SUB_SUMMON(9), /** - * CHANGE_HP_REASON_SUB_SCRIPT = 10; + * CHANGE_HP_SUB_SCRIPT = 10; */ - CHANGE_HP_REASON_SUB_SCRIPT(10), + CHANGE_HP_SUB_SCRIPT(10), /** - * CHANGE_HP_REASON_SUB_GM = 11; + * CHANGE_HP_SUB_GM = 11; */ - CHANGE_HP_REASON_SUB_GM(11), + CHANGE_HP_SUB_GM(11), /** - * CHANGE_HP_REASON_SUB_KILL_SELF = 12; + * CHANGE_HP_SUB_KILL_SELF = 12; */ - CHANGE_HP_REASON_SUB_KILL_SELF(12), + CHANGE_HP_SUB_KILL_SELF(12), /** - * CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13; + * CHANGE_HP_SUB_CLIMATE_COLD = 13; */ - CHANGE_HP_REASON_SUB_CLIMATE_COLD(13), + CHANGE_HP_SUB_CLIMATE_COLD(13), /** - * CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14; + * CHANGE_HP_SUB_STORM_LIGHTNING = 14; */ - CHANGE_HP_REASON_SUB_STORM_LIGHTNING(14), + CHANGE_HP_SUB_STORM_LIGHTNING(14), /** - * CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15; + * CHANGE_HP_SUB_KILL_SERVER_GADGET = 15; */ - CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET(15), + CHANGE_HP_SUB_KILL_SERVER_GADGET(15), /** - * CHANGE_HP_REASON_SUB_REPLACE = 16; + * CHANGE_HP_SUB_REPLACE = 16; */ - CHANGE_HP_REASON_SUB_REPLACE(16), + CHANGE_HP_SUB_REPLACE(16), /** - * CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17; + * CHANGE_HP_SUB_PLAYER_LEAVE = 17; */ - CHANGE_HP_REASON_SUB_PLAYER_LEAVE(17), + CHANGE_HP_SUB_PLAYER_LEAVE(17), /** - * CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18; + * CHANGE_HP_ATTACK_BY_ENERGY = 18; */ - CHANGE_HP_REASON_ATTACK_BY_ENERGY(18), + CHANGE_HP_ATTACK_BY_ENERGY(18), /** - * CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19; + * CHANGE_HP_ATTACK_BY_RECYCLE = 19; */ - CHANGE_HP_REASON_ATTACK_BY_RECYCLE(19), + CHANGE_HP_ATTACK_BY_RECYCLE(19), /** - * CHANGE_HP_REASON_SUB_PLAYER_BACK = 20; + * CHANGE_HP_SUB_PLAYER_BACK = 20; */ - CHANGE_HP_REASON_SUB_PLAYER_BACK(20), + CHANGE_HP_SUB_PLAYER_BACK(20), /** - * CHANGE_HP_REASON_SUB_UGC = 21; + * CHANGE_HP_SUB_UGC = 21; */ - CHANGE_HP_REASON_SUB_UGC(21), + CHANGE_HP_SUB_UGC(21), /** - * CHANGE_HP_REASON_BY_LUA = 51; + * CHANGE_HP_SUB_DIRTY_WATER_EROSION = 22; */ - CHANGE_HP_REASON_BY_LUA(51), + CHANGE_HP_SUB_DIRTY_WATER_EROSION(22), /** - * CHANGE_HP_REASON_ADD_ABILITY = 101; + * CHANGE_HP_SUB_DESTROY_SELF = 23; */ - CHANGE_HP_REASON_ADD_ABILITY(101), + CHANGE_HP_SUB_DESTROY_SELF(23), /** - * CHANGE_HP_REASON_ADD_ITEM = 102; + * CHANGE_HP_SUB_LIQUID_PHLOGISTON = 24; */ - CHANGE_HP_REASON_ADD_ITEM(102), + CHANGE_HP_SUB_LIQUID_PHLOGISTON(24), /** - * CHANGE_HP_REASON_ADD_REVIVE = 103; + * CHANGE_HP_BY_LUA = 51; */ - CHANGE_HP_REASON_ADD_REVIVE(103), + CHANGE_HP_BY_LUA(51), /** - * CHANGE_HP_REASON_ADD_UPGRADE = 104; + * CHANGE_HP_ADD_ABILITY = 101; */ - CHANGE_HP_REASON_ADD_UPGRADE(104), + CHANGE_HP_ADD_ABILITY(101), /** - * CHANGE_HP_REASON_ADD_STATUE = 105; + * CHANGE_HP_ADD_ITEM = 102; */ - CHANGE_HP_REASON_ADD_STATUE(105), + CHANGE_HP_ADD_ITEM(102), /** - * CHANGE_HP_REASON_ADD_BACKGROUND = 106; + * CHANGE_HP_ADD_REVIVE = 103; */ - CHANGE_HP_REASON_ADD_BACKGROUND(106), + CHANGE_HP_ADD_REVIVE(103), /** - * CHANGE_HP_REASON_ADD_GM = 107; + * CHANGE_HP_ADD_UPGRADE = 104; */ - CHANGE_HP_REASON_ADD_GM(107), + CHANGE_HP_ADD_UPGRADE(104), /** - * CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108; + * CHANGE_HP_ADD_STATUE = 105; */ - CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY(108), + CHANGE_HP_ADD_STATUE(105), /** - * CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING = 109; + * CHANGE_HP_ADD_BACKGROUND = 106; */ - CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING(109), + CHANGE_HP_ADD_BACKGROUND(106), /** - * CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5 = 110; + * CHANGE_HP_ADD_GM = 107; */ - CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5(110), + CHANGE_HP_ADD_GM(107), + /** + * CHANGE_HP_ADD_TRIAL_AVATAR_ACTIVITY = 108; + */ + CHANGE_HP_ADD_TRIAL_AVATAR_ACTIVITY(108), + /** + * CHANGE_HP_ADD_ROUGUELIKE_SPRING = 109; + */ + CHANGE_HP_ADD_ROUGUELIKE_SPRING(109), + /** + * CHANGE_HP_ADD_EFFIGY_CHALLENGE_V_5 = 110; + */ + CHANGE_HP_ADD_EFFIGY_CHALLENGE_V_5(110), UNRECOGNIZED(-1), ; /** - * CHANGE_HP_REASON_NONE = 0; + * CHANGE_HP_NONE = 0; + */ + public static final int CHANGE_HP_NONE_VALUE = 0; + /** + * CHANGE_HP_SUB_AVATAR = 1; + */ + public static final int CHANGE_HP_SUB_AVATAR_VALUE = 1; + /** + * CHANGE_HP_SUB_MONSTER = 2; + */ + public static final int CHANGE_HP_SUB_MONSTER_VALUE = 2; + /** + * CHANGE_HP_SUB_GEAR = 3; */ - public static final int CHANGE_HP_REASON_NONE_VALUE = 0; + public static final int CHANGE_HP_SUB_GEAR_VALUE = 3; /** - * CHANGE_HP_REASON_SUB_AVATAR = 1; + * CHANGE_HP_SUB_ENVIR = 4; */ - public static final int CHANGE_HP_REASON_SUB_AVATAR_VALUE = 1; + public static final int CHANGE_HP_SUB_ENVIR_VALUE = 4; /** - * CHANGE_HP_REASON_SUB_MONSTER = 2; + * CHANGE_HP_SUB_FALL = 5; */ - public static final int CHANGE_HP_REASON_SUB_MONSTER_VALUE = 2; + public static final int CHANGE_HP_SUB_FALL_VALUE = 5; /** - * CHANGE_HP_REASON_SUB_GEAR = 3; + * CHANGE_HP_SUB_DRAWN = 6; */ - public static final int CHANGE_HP_REASON_SUB_GEAR_VALUE = 3; + public static final int CHANGE_HP_SUB_DRAWN_VALUE = 6; /** - * CHANGE_HP_REASON_SUB_ENVIR = 4; + * CHANGE_HP_SUB_ABYSS = 7; */ - public static final int CHANGE_HP_REASON_SUB_ENVIR_VALUE = 4; + public static final int CHANGE_HP_SUB_ABYSS_VALUE = 7; /** - * CHANGE_HP_REASON_SUB_FALL = 5; + * CHANGE_HP_SUB_ABILITY = 8; */ - public static final int CHANGE_HP_REASON_SUB_FALL_VALUE = 5; + public static final int CHANGE_HP_SUB_ABILITY_VALUE = 8; /** - * CHANGE_HP_REASON_SUB_DRAWN = 6; + * CHANGE_HP_SUB_SUMMON = 9; */ - public static final int CHANGE_HP_REASON_SUB_DRAWN_VALUE = 6; + public static final int CHANGE_HP_SUB_SUMMON_VALUE = 9; /** - * CHANGE_HP_REASON_SUB_ABYSS = 7; + * CHANGE_HP_SUB_SCRIPT = 10; */ - public static final int CHANGE_HP_REASON_SUB_ABYSS_VALUE = 7; + public static final int CHANGE_HP_SUB_SCRIPT_VALUE = 10; /** - * CHANGE_HP_REASON_SUB_ABILITY = 8; + * CHANGE_HP_SUB_GM = 11; */ - public static final int CHANGE_HP_REASON_SUB_ABILITY_VALUE = 8; + public static final int CHANGE_HP_SUB_GM_VALUE = 11; /** - * CHANGE_HP_REASON_SUB_SUMMON = 9; + * CHANGE_HP_SUB_KILL_SELF = 12; */ - public static final int CHANGE_HP_REASON_SUB_SUMMON_VALUE = 9; + public static final int CHANGE_HP_SUB_KILL_SELF_VALUE = 12; /** - * CHANGE_HP_REASON_SUB_SCRIPT = 10; + * CHANGE_HP_SUB_CLIMATE_COLD = 13; */ - public static final int CHANGE_HP_REASON_SUB_SCRIPT_VALUE = 10; + public static final int CHANGE_HP_SUB_CLIMATE_COLD_VALUE = 13; /** - * CHANGE_HP_REASON_SUB_GM = 11; + * CHANGE_HP_SUB_STORM_LIGHTNING = 14; */ - public static final int CHANGE_HP_REASON_SUB_GM_VALUE = 11; + public static final int CHANGE_HP_SUB_STORM_LIGHTNING_VALUE = 14; /** - * CHANGE_HP_REASON_SUB_KILL_SELF = 12; + * CHANGE_HP_SUB_KILL_SERVER_GADGET = 15; */ - public static final int CHANGE_HP_REASON_SUB_KILL_SELF_VALUE = 12; + public static final int CHANGE_HP_SUB_KILL_SERVER_GADGET_VALUE = 15; /** - * CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13; + * CHANGE_HP_SUB_REPLACE = 16; */ - public static final int CHANGE_HP_REASON_SUB_CLIMATE_COLD_VALUE = 13; + public static final int CHANGE_HP_SUB_REPLACE_VALUE = 16; /** - * CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14; + * CHANGE_HP_SUB_PLAYER_LEAVE = 17; */ - public static final int CHANGE_HP_REASON_SUB_STORM_LIGHTNING_VALUE = 14; + public static final int CHANGE_HP_SUB_PLAYER_LEAVE_VALUE = 17; /** - * CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15; + * CHANGE_HP_ATTACK_BY_ENERGY = 18; */ - public static final int CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET_VALUE = 15; + public static final int CHANGE_HP_ATTACK_BY_ENERGY_VALUE = 18; /** - * CHANGE_HP_REASON_SUB_REPLACE = 16; + * CHANGE_HP_ATTACK_BY_RECYCLE = 19; */ - public static final int CHANGE_HP_REASON_SUB_REPLACE_VALUE = 16; + public static final int CHANGE_HP_ATTACK_BY_RECYCLE_VALUE = 19; /** - * CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17; + * CHANGE_HP_SUB_PLAYER_BACK = 20; */ - public static final int CHANGE_HP_REASON_SUB_PLAYER_LEAVE_VALUE = 17; + public static final int CHANGE_HP_SUB_PLAYER_BACK_VALUE = 20; /** - * CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18; + * CHANGE_HP_SUB_UGC = 21; */ - public static final int CHANGE_HP_REASON_ATTACK_BY_ENERGY_VALUE = 18; + public static final int CHANGE_HP_SUB_UGC_VALUE = 21; /** - * CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19; + * CHANGE_HP_SUB_DIRTY_WATER_EROSION = 22; */ - public static final int CHANGE_HP_REASON_ATTACK_BY_RECYCLE_VALUE = 19; + public static final int CHANGE_HP_SUB_DIRTY_WATER_EROSION_VALUE = 22; /** - * CHANGE_HP_REASON_SUB_PLAYER_BACK = 20; + * CHANGE_HP_SUB_DESTROY_SELF = 23; */ - public static final int CHANGE_HP_REASON_SUB_PLAYER_BACK_VALUE = 20; + public static final int CHANGE_HP_SUB_DESTROY_SELF_VALUE = 23; /** - * CHANGE_HP_REASON_SUB_UGC = 21; + * CHANGE_HP_SUB_LIQUID_PHLOGISTON = 24; */ - public static final int CHANGE_HP_REASON_SUB_UGC_VALUE = 21; + public static final int CHANGE_HP_SUB_LIQUID_PHLOGISTON_VALUE = 24; /** - * CHANGE_HP_REASON_BY_LUA = 51; + * CHANGE_HP_BY_LUA = 51; */ - public static final int CHANGE_HP_REASON_BY_LUA_VALUE = 51; + public static final int CHANGE_HP_BY_LUA_VALUE = 51; /** - * CHANGE_HP_REASON_ADD_ABILITY = 101; + * CHANGE_HP_ADD_ABILITY = 101; */ - public static final int CHANGE_HP_REASON_ADD_ABILITY_VALUE = 101; + public static final int CHANGE_HP_ADD_ABILITY_VALUE = 101; /** - * CHANGE_HP_REASON_ADD_ITEM = 102; + * CHANGE_HP_ADD_ITEM = 102; */ - public static final int CHANGE_HP_REASON_ADD_ITEM_VALUE = 102; + public static final int CHANGE_HP_ADD_ITEM_VALUE = 102; /** - * CHANGE_HP_REASON_ADD_REVIVE = 103; + * CHANGE_HP_ADD_REVIVE = 103; */ - public static final int CHANGE_HP_REASON_ADD_REVIVE_VALUE = 103; + public static final int CHANGE_HP_ADD_REVIVE_VALUE = 103; /** - * CHANGE_HP_REASON_ADD_UPGRADE = 104; + * CHANGE_HP_ADD_UPGRADE = 104; */ - public static final int CHANGE_HP_REASON_ADD_UPGRADE_VALUE = 104; + public static final int CHANGE_HP_ADD_UPGRADE_VALUE = 104; /** - * CHANGE_HP_REASON_ADD_STATUE = 105; + * CHANGE_HP_ADD_STATUE = 105; */ - public static final int CHANGE_HP_REASON_ADD_STATUE_VALUE = 105; + public static final int CHANGE_HP_ADD_STATUE_VALUE = 105; /** - * CHANGE_HP_REASON_ADD_BACKGROUND = 106; + * CHANGE_HP_ADD_BACKGROUND = 106; */ - public static final int CHANGE_HP_REASON_ADD_BACKGROUND_VALUE = 106; + public static final int CHANGE_HP_ADD_BACKGROUND_VALUE = 106; /** - * CHANGE_HP_REASON_ADD_GM = 107; + * CHANGE_HP_ADD_GM = 107; */ - public static final int CHANGE_HP_REASON_ADD_GM_VALUE = 107; + public static final int CHANGE_HP_ADD_GM_VALUE = 107; /** - * CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108; + * CHANGE_HP_ADD_TRIAL_AVATAR_ACTIVITY = 108; */ - public static final int CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY_VALUE = 108; + public static final int CHANGE_HP_ADD_TRIAL_AVATAR_ACTIVITY_VALUE = 108; /** - * CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING = 109; + * CHANGE_HP_ADD_ROUGUELIKE_SPRING = 109; */ - public static final int CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING_VALUE = 109; + public static final int CHANGE_HP_ADD_ROUGUELIKE_SPRING_VALUE = 109; /** - * CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5 = 110; + * CHANGE_HP_ADD_EFFIGY_CHALLENGE_V_5 = 110; */ - public static final int CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5_VALUE = 110; + public static final int CHANGE_HP_ADD_EFFIGY_CHALLENGE_V_5_VALUE = 110; public final int getNumber() { @@ -312,39 +336,42 @@ public static ChangeHpReason valueOf(int value) { */ public static ChangeHpReason forNumber(int value) { switch (value) { - case 0: return CHANGE_HP_REASON_NONE; - case 1: return CHANGE_HP_REASON_SUB_AVATAR; - case 2: return CHANGE_HP_REASON_SUB_MONSTER; - case 3: return CHANGE_HP_REASON_SUB_GEAR; - case 4: return CHANGE_HP_REASON_SUB_ENVIR; - case 5: return CHANGE_HP_REASON_SUB_FALL; - case 6: return CHANGE_HP_REASON_SUB_DRAWN; - case 7: return CHANGE_HP_REASON_SUB_ABYSS; - case 8: return CHANGE_HP_REASON_SUB_ABILITY; - case 9: return CHANGE_HP_REASON_SUB_SUMMON; - case 10: return CHANGE_HP_REASON_SUB_SCRIPT; - case 11: return CHANGE_HP_REASON_SUB_GM; - case 12: return CHANGE_HP_REASON_SUB_KILL_SELF; - case 13: return CHANGE_HP_REASON_SUB_CLIMATE_COLD; - case 14: return CHANGE_HP_REASON_SUB_STORM_LIGHTNING; - case 15: return CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET; - case 16: return CHANGE_HP_REASON_SUB_REPLACE; - case 17: return CHANGE_HP_REASON_SUB_PLAYER_LEAVE; - case 18: return CHANGE_HP_REASON_ATTACK_BY_ENERGY; - case 19: return CHANGE_HP_REASON_ATTACK_BY_RECYCLE; - case 20: return CHANGE_HP_REASON_SUB_PLAYER_BACK; - case 21: return CHANGE_HP_REASON_SUB_UGC; - case 51: return CHANGE_HP_REASON_BY_LUA; - case 101: return CHANGE_HP_REASON_ADD_ABILITY; - case 102: return CHANGE_HP_REASON_ADD_ITEM; - case 103: return CHANGE_HP_REASON_ADD_REVIVE; - case 104: return CHANGE_HP_REASON_ADD_UPGRADE; - case 105: return CHANGE_HP_REASON_ADD_STATUE; - case 106: return CHANGE_HP_REASON_ADD_BACKGROUND; - case 107: return CHANGE_HP_REASON_ADD_GM; - case 108: return CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY; - case 109: return CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING; - case 110: return CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5; + case 0: return CHANGE_HP_NONE; + case 1: return CHANGE_HP_SUB_AVATAR; + case 2: return CHANGE_HP_SUB_MONSTER; + case 3: return CHANGE_HP_SUB_GEAR; + case 4: return CHANGE_HP_SUB_ENVIR; + case 5: return CHANGE_HP_SUB_FALL; + case 6: return CHANGE_HP_SUB_DRAWN; + case 7: return CHANGE_HP_SUB_ABYSS; + case 8: return CHANGE_HP_SUB_ABILITY; + case 9: return CHANGE_HP_SUB_SUMMON; + case 10: return CHANGE_HP_SUB_SCRIPT; + case 11: return CHANGE_HP_SUB_GM; + case 12: return CHANGE_HP_SUB_KILL_SELF; + case 13: return CHANGE_HP_SUB_CLIMATE_COLD; + case 14: return CHANGE_HP_SUB_STORM_LIGHTNING; + case 15: return CHANGE_HP_SUB_KILL_SERVER_GADGET; + case 16: return CHANGE_HP_SUB_REPLACE; + case 17: return CHANGE_HP_SUB_PLAYER_LEAVE; + case 18: return CHANGE_HP_ATTACK_BY_ENERGY; + case 19: return CHANGE_HP_ATTACK_BY_RECYCLE; + case 20: return CHANGE_HP_SUB_PLAYER_BACK; + case 21: return CHANGE_HP_SUB_UGC; + case 22: return CHANGE_HP_SUB_DIRTY_WATER_EROSION; + case 23: return CHANGE_HP_SUB_DESTROY_SELF; + case 24: return CHANGE_HP_SUB_LIQUID_PHLOGISTON; + case 51: return CHANGE_HP_BY_LUA; + case 101: return CHANGE_HP_ADD_ABILITY; + case 102: return CHANGE_HP_ADD_ITEM; + case 103: return CHANGE_HP_ADD_REVIVE; + case 104: return CHANGE_HP_ADD_UPGRADE; + case 105: return CHANGE_HP_ADD_STATUE; + case 106: return CHANGE_HP_ADD_BACKGROUND; + case 107: return CHANGE_HP_ADD_GM; + case 108: return CHANGE_HP_ADD_TRIAL_AVATAR_ACTIVITY; + case 109: return CHANGE_HP_ADD_ROUGUELIKE_SPRING; + case 110: return CHANGE_HP_ADD_EFFIGY_CHALLENGE_V_5; default: return null; } } @@ -410,37 +437,34 @@ private ChangeHpReason(int value) { descriptor; static { java.lang.String[] descriptorData = { - "\n\024ChangeHpReason.proto*\231\t\n\016ChangeHpReaso" + - "n\022\031\n\025CHANGE_HP_REASON_NONE\020\000\022\037\n\033CHANGE_H" + - "P_REASON_SUB_AVATAR\020\001\022 \n\034CHANGE_HP_REASO" + - "N_SUB_MONSTER\020\002\022\035\n\031CHANGE_HP_REASON_SUB_" + - "GEAR\020\003\022\036\n\032CHANGE_HP_REASON_SUB_ENVIR\020\004\022\035" + - "\n\031CHANGE_HP_REASON_SUB_FALL\020\005\022\036\n\032CHANGE_" + - "HP_REASON_SUB_DRAWN\020\006\022\036\n\032CHANGE_HP_REASO" + - "N_SUB_ABYSS\020\007\022 \n\034CHANGE_HP_REASON_SUB_AB" + - "ILITY\020\010\022\037\n\033CHANGE_HP_REASON_SUB_SUMMON\020\t" + - "\022\037\n\033CHANGE_HP_REASON_SUB_SCRIPT\020\n\022\033\n\027CHA" + - "NGE_HP_REASON_SUB_GM\020\013\022\"\n\036CHANGE_HP_REAS" + - "ON_SUB_KILL_SELF\020\014\022%\n!CHANGE_HP_REASON_S" + - "UB_CLIMATE_COLD\020\r\022(\n$CHANGE_HP_REASON_SU" + - "B_STORM_LIGHTNING\020\016\022+\n\'CHANGE_HP_REASON_" + - "SUB_KILL_SERVER_GADGET\020\017\022 \n\034CHANGE_HP_RE" + - "ASON_SUB_REPLACE\020\020\022%\n!CHANGE_HP_REASON_S" + - "UB_PLAYER_LEAVE\020\021\022%\n!CHANGE_HP_REASON_AT" + - "TACK_BY_ENERGY\020\022\022&\n\"CHANGE_HP_REASON_ATT" + - "ACK_BY_RECYCLE\020\023\022$\n CHANGE_HP_REASON_SUB" + - "_PLAYER_BACK\020\024\022\034\n\030CHANGE_HP_REASON_SUB_U" + - "GC\020\025\022\033\n\027CHANGE_HP_REASON_BY_LUA\0203\022 \n\034CHA" + - "NGE_HP_REASON_ADD_ABILITY\020e\022\035\n\031CHANGE_HP" + - "_REASON_ADD_ITEM\020f\022\037\n\033CHANGE_HP_REASON_A" + - "DD_REVIVE\020g\022 \n\034CHANGE_HP_REASON_ADD_UPGR" + - "ADE\020h\022\037\n\033CHANGE_HP_REASON_ADD_STATUE\020i\022#" + - "\n\037CHANGE_HP_REASON_ADD_BACKGROUND\020j\022\033\n\027C" + - "HANGE_HP_REASON_ADD_GM\020k\022.\n*CHANGE_HP_RE" + - "ASON_ADD_TRIAL_AVATAR_ACTIVITY\020l\022)\n%CHAN" + - "GE_HP_REASON_ADD_ROGUELIKE_SPRING\020m\022-\n)C" + - "HANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5" + - "\020nB\033\n\031emu.grasscutter.net.protob\006proto3" + "\n\024ChangeHpReason.proto*\237\010\n\016ChangeHpReaso" + + "n\022\022\n\016CHANGE_HP_NONE\020\000\022\030\n\024CHANGE_HP_SUB_A" + + "VATAR\020\001\022\031\n\025CHANGE_HP_SUB_MONSTER\020\002\022\026\n\022CH" + + "ANGE_HP_SUB_GEAR\020\003\022\027\n\023CHANGE_HP_SUB_ENVI" + + "R\020\004\022\026\n\022CHANGE_HP_SUB_FALL\020\005\022\027\n\023CHANGE_HP" + + "_SUB_DRAWN\020\006\022\027\n\023CHANGE_HP_SUB_ABYSS\020\007\022\031\n" + + "\025CHANGE_HP_SUB_ABILITY\020\010\022\030\n\024CHANGE_HP_SU" + + "B_SUMMON\020\t\022\030\n\024CHANGE_HP_SUB_SCRIPT\020\n\022\024\n\020" + + "CHANGE_HP_SUB_GM\020\013\022\033\n\027CHANGE_HP_SUB_KILL" + + "_SELF\020\014\022\036\n\032CHANGE_HP_SUB_CLIMATE_COLD\020\r\022" + + "!\n\035CHANGE_HP_SUB_STORM_LIGHTNING\020\016\022$\n CH" + + "ANGE_HP_SUB_KILL_SERVER_GADGET\020\017\022\031\n\025CHAN" + + "GE_HP_SUB_REPLACE\020\020\022\036\n\032CHANGE_HP_SUB_PLA" + + "YER_LEAVE\020\021\022\036\n\032CHANGE_HP_ATTACK_BY_ENERG" + + "Y\020\022\022\037\n\033CHANGE_HP_ATTACK_BY_RECYCLE\020\023\022\035\n\031" + + "CHANGE_HP_SUB_PLAYER_BACK\020\024\022\025\n\021CHANGE_HP" + + "_SUB_UGC\020\025\022%\n!CHANGE_HP_SUB_DIRTY_WATER_" + + "EROSION\020\026\022\036\n\032CHANGE_HP_SUB_DESTROY_SELF\020" + + "\027\022#\n\037CHANGE_HP_SUB_LIQUID_PHLOGISTON\020\030\022\024" + + "\n\020CHANGE_HP_BY_LUA\0203\022\031\n\025CHANGE_HP_ADD_AB" + + "ILITY\020e\022\026\n\022CHANGE_HP_ADD_ITEM\020f\022\030\n\024CHANG" + + "E_HP_ADD_REVIVE\020g\022\031\n\025CHANGE_HP_ADD_UPGRA" + + "DE\020h\022\030\n\024CHANGE_HP_ADD_STATUE\020i\022\034\n\030CHANGE" + + "_HP_ADD_BACKGROUND\020j\022\024\n\020CHANGE_HP_ADD_GM" + + "\020k\022\'\n#CHANGE_HP_ADD_TRIAL_AVATAR_ACTIVIT" + + "Y\020l\022#\n\037CHANGE_HP_ADD_ROUGUELIKE_SPRING\020m" + + "\022&\n\"CHANGE_HP_ADD_EFFIGY_CHALLENGE_V_5\020n" + + "B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarReqOuterClass.java index 1adb7ad8745..a00f4425aad 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarReqOuterClass.java @@ -44,6 +44,7 @@ public interface ChangeMpTeamAvatarReqOrBuilder extends /** * 
    * CmdId: 28747
+   * obf: DBEBGAGNGEG
    *
* * Protobuf type {@code ChangeMpTeamAvatarReq} @@ -379,6 +380,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 28747
+     * obf: DBEBGAGNGEG
      *
* * Protobuf type {@code ChangeMpTeamAvatarReq} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarRspOuterClass.java index fa9fc3851ca..bf2cf519fd4 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarRspOuterClass.java @@ -50,6 +50,7 @@ public interface ChangeMpTeamAvatarRspOrBuilder extends /** * 
    * CmdId: 28252
+   * obf: KCNOOLDKOPD
    *
* * Protobuf type {@code ChangeMpTeamAvatarRsp} @@ -412,6 +413,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 28252
+     * obf: KCNOOLDKOPD
      *
* * Protobuf type {@code ChangeMpTeamAvatarRsp} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChannellerSlabLoopDungeonInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChannellerSlabLoopDungeonInfoOuterClass.java index 35efff7b759..3da69609ddd 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChannellerSlabLoopDungeonInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChannellerSlabLoopDungeonInfoOuterClass.java @@ -19,55 +19,55 @@ public interface ChannellerSlabLoopDungeonInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 open_time = 13; - * @return The openTime. + * bool is_open = 4; + * @return The isOpen. */ - int getOpenTime(); + boolean getIsOpen(); /** - * uint32 score = 14; + * uint32 score = 5; * @return The score. */ int getScore(); /** - * repeated uint32 last_condition_id_list = 1; + * uint32 dungeon_index = 6; + * @return The dungeonIndex. + */ + int getDungeonIndex(); + + /** + * repeated uint32 last_condition_id_list = 7; * @return A list containing the lastConditionIdList. */ java.util.List getLastConditionIdListList(); /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @return The count of lastConditionIdList. */ int getLastConditionIdListCount(); /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @param index The index of the element to return. * @return The lastConditionIdList at the given index. */ int getLastConditionIdList(int index); /** - * uint32 dungeon_index = 6; - * @return The dungeonIndex. + * uint32 open_time = 8; + * @return The openTime. */ - int getDungeonIndex(); + int getOpenTime(); /** - * bool is_first_pass_reward_taken = 2; + * bool is_first_pass_reward_taken = 13; * @return The isFirstPassRewardTaken. */ boolean getIsFirstPassRewardTaken(); - - /** - * bool is_open = 15; - * @return The isOpen. - */ - boolean getIsOpen(); } /** * 
-   * Obf: CKMPMHKJFFI
+   * obf: ONFLENEINO1B
    *
* * Protobuf type {@code ChannellerSlabLoopDungeonInfo} @@ -116,7 +116,22 @@ private ChannellerSlabLoopDungeonInfo( case 0: done = true; break; - case 8: { + case 32: { + + isOpen_ = input.readBool(); + break; + } + case 40: { + + score_ = input.readUInt32(); + break; + } + case 48: { + + dungeonIndex_ = input.readUInt32(); + break; + } + case 56: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { lastConditionIdList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -124,7 +139,7 @@ private ChannellerSlabLoopDungeonInfo( lastConditionIdList_.addInt(input.readUInt32()); break; } - case 10: { + case 58: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -137,29 +152,14 @@ private ChannellerSlabLoopDungeonInfo( input.popLimit(limit); break; } - case 16: { - - isFirstPassRewardTaken_ = input.readBool(); - break; - } - case 48: { - - dungeonIndex_ = input.readUInt32(); - break; - } - case 104: { + case 64: { openTime_ = input.readUInt32(); break; } - case 112: { - - score_ = input.readUInt32(); - break; - } - case 120: { + case 104: { - isOpen_ = input.readBool(); + isFirstPassRewardTaken_ = input.readBool(); break; } default: { @@ -197,21 +197,21 @@ private ChannellerSlabLoopDungeonInfo( emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo.class, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo.Builder.class); } - public static final int OPEN_TIME_FIELD_NUMBER = 13; - private int openTime_; + public static final int IS_OPEN_FIELD_NUMBER = 4; + private boolean isOpen_; /** - * uint32 open_time = 13; - * @return The openTime. + * bool is_open = 4; + * @return The isOpen. */ @java.lang.Override - public int getOpenTime() { - return openTime_; + public boolean getIsOpen() { + return isOpen_; } - public static final int SCORE_FIELD_NUMBER = 14; + public static final int SCORE_FIELD_NUMBER = 5; private int score_; /** - * uint32 score = 14; + * uint32 score = 5; * @return The score. */ @java.lang.Override @@ -219,10 +219,21 @@ public int getScore() { return score_; } - public static final int LAST_CONDITION_ID_LIST_FIELD_NUMBER = 1; + public static final int DUNGEON_INDEX_FIELD_NUMBER = 6; + private int dungeonIndex_; + /** + * uint32 dungeon_index = 6; + * @return The dungeonIndex. + */ + @java.lang.Override + public int getDungeonIndex() { + return dungeonIndex_; + } + + public static final int LAST_CONDITION_ID_LIST_FIELD_NUMBER = 7; private com.google.protobuf.Internal.IntList lastConditionIdList_; /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @return A list containing the lastConditionIdList. */ @java.lang.Override @@ -231,14 +242,14 @@ public int getScore() { return lastConditionIdList_; } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @return The count of lastConditionIdList. */ public int getLastConditionIdListCount() { return lastConditionIdList_.size(); } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @param index The index of the element to return. * @return The lastConditionIdList at the given index. */ @@ -247,21 +258,21 @@ public int getLastConditionIdList(int index) { } private int lastConditionIdListMemoizedSerializedSize = -1; - public static final int DUNGEON_INDEX_FIELD_NUMBER = 6; - private int dungeonIndex_; + public static final int OPEN_TIME_FIELD_NUMBER = 8; + private int openTime_; /** - * uint32 dungeon_index = 6; - * @return The dungeonIndex. + * uint32 open_time = 8; + * @return The openTime. */ @java.lang.Override - public int getDungeonIndex() { - return dungeonIndex_; + public int getOpenTime() { + return openTime_; } - public static final int IS_FIRST_PASS_REWARD_TAKEN_FIELD_NUMBER = 2; + public static final int IS_FIRST_PASS_REWARD_TAKEN_FIELD_NUMBER = 13; private boolean isFirstPassRewardTaken_; /** - * bool is_first_pass_reward_taken = 2; + * bool is_first_pass_reward_taken = 13; * @return The isFirstPassRewardTaken. */ @java.lang.Override @@ -269,17 +280,6 @@ public boolean getIsFirstPassRewardTaken() { return isFirstPassRewardTaken_; } - public static final int IS_OPEN_FIELD_NUMBER = 15; - private boolean isOpen_; - /** - * bool is_open = 15; - * @return The isOpen. - */ - @java.lang.Override - public boolean getIsOpen() { - return isOpen_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -295,27 +295,27 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); + if (isOpen_ != false) { + output.writeBool(4, isOpen_); + } + if (score_ != 0) { + output.writeUInt32(5, score_); + } + if (dungeonIndex_ != 0) { + output.writeUInt32(6, dungeonIndex_); + } if (getLastConditionIdListList().size() > 0) { - output.writeUInt32NoTag(10); + output.writeUInt32NoTag(58); output.writeUInt32NoTag(lastConditionIdListMemoizedSerializedSize); } for (int i = 0; i < lastConditionIdList_.size(); i++) { output.writeUInt32NoTag(lastConditionIdList_.getInt(i)); } - if (isFirstPassRewardTaken_ != false) { - output.writeBool(2, isFirstPassRewardTaken_); - } - if (dungeonIndex_ != 0) { - output.writeUInt32(6, dungeonIndex_); - } if (openTime_ != 0) { - output.writeUInt32(13, openTime_); - } - if (score_ != 0) { - output.writeUInt32(14, score_); + output.writeUInt32(8, openTime_); } - if (isOpen_ != false) { - output.writeBool(15, isOpen_); + if (isFirstPassRewardTaken_ != false) { + output.writeBool(13, isFirstPassRewardTaken_); } unknownFields.writeTo(output); } @@ -326,6 +326,18 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (isOpen_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, isOpen_); + } + if (score_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(5, score_); + } + if (dungeonIndex_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(6, dungeonIndex_); + } { int dataSize = 0; for (int i = 0; i < lastConditionIdList_.size(); i++) { @@ -340,25 +352,13 @@ public int getSerializedSize() { } lastConditionIdListMemoizedSerializedSize = dataSize; } - if (isFirstPassRewardTaken_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, isFirstPassRewardTaken_); - } - if (dungeonIndex_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, dungeonIndex_); - } if (openTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, openTime_); - } - if (score_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, score_); + .computeUInt32Size(8, openTime_); } - if (isOpen_ != false) { + if (isFirstPassRewardTaken_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(15, isOpen_); + .computeBoolSize(13, isFirstPassRewardTaken_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -375,18 +375,18 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo other = (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo) obj; - if (getOpenTime() - != other.getOpenTime()) return false; + if (getIsOpen() + != other.getIsOpen()) return false; if (getScore() != other.getScore()) return false; - if (!getLastConditionIdListList() - .equals(other.getLastConditionIdListList())) return false; if (getDungeonIndex() != other.getDungeonIndex()) return false; + if (!getLastConditionIdListList() + .equals(other.getLastConditionIdListList())) return false; + if (getOpenTime() + != other.getOpenTime()) return false; if (getIsFirstPassRewardTaken() != other.getIsFirstPassRewardTaken()) return false; - if (getIsOpen() - != other.getIsOpen()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -398,22 +398,22 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + OPEN_TIME_FIELD_NUMBER; - hash = (53 * hash) + getOpenTime(); + hash = (37 * hash) + IS_OPEN_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsOpen()); hash = (37 * hash) + SCORE_FIELD_NUMBER; hash = (53 * hash) + getScore(); + hash = (37 * hash) + DUNGEON_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getDungeonIndex(); if (getLastConditionIdListCount() > 0) { hash = (37 * hash) + LAST_CONDITION_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getLastConditionIdListList().hashCode(); } - hash = (37 * hash) + DUNGEON_INDEX_FIELD_NUMBER; - hash = (53 * hash) + getDungeonIndex(); + hash = (37 * hash) + OPEN_TIME_FIELD_NUMBER; + hash = (53 * hash) + getOpenTime(); hash = (37 * hash) + IS_FIRST_PASS_REWARD_TAKEN_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsFirstPassRewardTaken()); - hash = (37 * hash) + IS_OPEN_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsOpen()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -511,7 +511,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: CKMPMHKJFFI
+     * obf: ONFLENEINO1B
      *
* * Protobuf type {@code ChannellerSlabLoopDungeonInfo} @@ -551,18 +551,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - openTime_ = 0; + isOpen_ = false; score_ = 0; + dungeonIndex_ = 0; + lastConditionIdList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - dungeonIndex_ = 0; + openTime_ = 0; isFirstPassRewardTaken_ = false; - isOpen_ = false; - return this; } @@ -590,16 +590,16 @@ public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.Channel public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo buildPartial() { emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo result = new emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo(this); int from_bitField0_ = bitField0_; - result.openTime_ = openTime_; + result.isOpen_ = isOpen_; result.score_ = score_; + result.dungeonIndex_ = dungeonIndex_; if (((bitField0_ & 0x00000001) != 0)) { lastConditionIdList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.lastConditionIdList_ = lastConditionIdList_; - result.dungeonIndex_ = dungeonIndex_; + result.openTime_ = openTime_; result.isFirstPassRewardTaken_ = isFirstPassRewardTaken_; - result.isOpen_ = isOpen_; onBuilt(); return result; } @@ -648,12 +648,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo other) { if (other == emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.ChannellerSlabLoopDungeonInfo.getDefaultInstance()) return this; - if (other.getOpenTime() != 0) { - setOpenTime(other.getOpenTime()); + if (other.getIsOpen() != false) { + setIsOpen(other.getIsOpen()); } if (other.getScore() != 0) { setScore(other.getScore()); } + if (other.getDungeonIndex() != 0) { + setDungeonIndex(other.getDungeonIndex()); + } if (!other.lastConditionIdList_.isEmpty()) { if (lastConditionIdList_.isEmpty()) { lastConditionIdList_ = other.lastConditionIdList_; @@ -664,15 +667,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfo } onChanged(); } - if (other.getDungeonIndex() != 0) { - setDungeonIndex(other.getDungeonIndex()); + if (other.getOpenTime() != 0) { + setOpenTime(other.getOpenTime()); } if (other.getIsFirstPassRewardTaken() != false) { setIsFirstPassRewardTaken(other.getIsFirstPassRewardTaken()); } - if (other.getIsOpen() != false) { - setIsOpen(other.getIsOpen()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -703,40 +703,40 @@ public Builder mergeFrom( } private int bitField0_; - private int openTime_ ; + private boolean isOpen_ ; /** - * uint32 open_time = 13; - * @return The openTime. + * bool is_open = 4; + * @return The isOpen. */ @java.lang.Override - public int getOpenTime() { - return openTime_; + public boolean getIsOpen() { + return isOpen_; } /** - * uint32 open_time = 13; - * @param value The openTime to set. + * bool is_open = 4; + * @param value The isOpen to set. * @return This builder for chaining. */ - public Builder setOpenTime(int value) { + public Builder setIsOpen(boolean value) { - openTime_ = value; + isOpen_ = value; onChanged(); return this; } /** - * uint32 open_time = 13; + * bool is_open = 4; * @return This builder for chaining. */ - public Builder clearOpenTime() { + public Builder clearIsOpen() { - openTime_ = 0; + isOpen_ = false; onChanged(); return this; } private int score_ ; /** - * uint32 score = 14; + * uint32 score = 5; * @return The score. */ @java.lang.Override @@ -744,7 +744,7 @@ public int getScore() { return score_; } /** - * uint32 score = 14; + * uint32 score = 5; * @param value The score to set. * @return This builder for chaining. */ @@ -755,7 +755,7 @@ public Builder setScore(int value) { return this; } /** - * uint32 score = 14; + * uint32 score = 5; * @return This builder for chaining. */ public Builder clearScore() { @@ -765,6 +765,37 @@ public Builder clearScore() { return this; } + private int dungeonIndex_ ; + /** + * uint32 dungeon_index = 6; + * @return The dungeonIndex. + */ + @java.lang.Override + public int getDungeonIndex() { + return dungeonIndex_; + } + /** + * uint32 dungeon_index = 6; + * @param value The dungeonIndex to set. + * @return This builder for chaining. + */ + public Builder setDungeonIndex(int value) { + + dungeonIndex_ = value; + onChanged(); + return this; + } + /** + * uint32 dungeon_index = 6; + * @return This builder for chaining. + */ + public Builder clearDungeonIndex() { + + dungeonIndex_ = 0; + onChanged(); + return this; + } + private com.google.protobuf.Internal.IntList lastConditionIdList_ = emptyIntList(); private void ensureLastConditionIdListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { @@ -773,7 +804,7 @@ private void ensureLastConditionIdListIsMutable() { } } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @return A list containing the lastConditionIdList. */ public java.util.List @@ -782,14 +813,14 @@ private void ensureLastConditionIdListIsMutable() { java.util.Collections.unmodifiableList(lastConditionIdList_) : lastConditionIdList_; } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @return The count of lastConditionIdList. */ public int getLastConditionIdListCount() { return lastConditionIdList_.size(); } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @param index The index of the element to return. * @return The lastConditionIdList at the given index. */ @@ -797,7 +828,7 @@ public int getLastConditionIdList(int index) { return lastConditionIdList_.getInt(index); } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @param index The index to set the value at. * @param value The lastConditionIdList to set. * @return This builder for chaining. @@ -810,7 +841,7 @@ public Builder setLastConditionIdList( return this; } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @param value The lastConditionIdList to add. * @return This builder for chaining. */ @@ -821,7 +852,7 @@ public Builder addLastConditionIdList(int value) { return this; } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @param values The lastConditionIdList to add. * @return This builder for chaining. */ @@ -834,7 +865,7 @@ public Builder addAllLastConditionIdList( return this; } /** - * repeated uint32 last_condition_id_list = 1; + * repeated uint32 last_condition_id_list = 7; * @return This builder for chaining. */ public Builder clearLastConditionIdList() { @@ -844,40 +875,40 @@ public Builder clearLastConditionIdList() { return this; } - private int dungeonIndex_ ; + private int openTime_ ; /** - * uint32 dungeon_index = 6; - * @return The dungeonIndex. + * uint32 open_time = 8; + * @return The openTime. */ @java.lang.Override - public int getDungeonIndex() { - return dungeonIndex_; + public int getOpenTime() { + return openTime_; } /** - * uint32 dungeon_index = 6; - * @param value The dungeonIndex to set. + * uint32 open_time = 8; + * @param value The openTime to set. * @return This builder for chaining. */ - public Builder setDungeonIndex(int value) { + public Builder setOpenTime(int value) { - dungeonIndex_ = value; + openTime_ = value; onChanged(); return this; } /** - * uint32 dungeon_index = 6; + * uint32 open_time = 8; * @return This builder for chaining. */ - public Builder clearDungeonIndex() { + public Builder clearOpenTime() { - dungeonIndex_ = 0; + openTime_ = 0; onChanged(); return this; } private boolean isFirstPassRewardTaken_ ; /** - * bool is_first_pass_reward_taken = 2; + * bool is_first_pass_reward_taken = 13; * @return The isFirstPassRewardTaken. */ @java.lang.Override @@ -885,7 +916,7 @@ public boolean getIsFirstPassRewardTaken() { return isFirstPassRewardTaken_; } /** - * bool is_first_pass_reward_taken = 2; + * bool is_first_pass_reward_taken = 13; * @param value The isFirstPassRewardTaken to set. * @return This builder for chaining. */ @@ -896,7 +927,7 @@ public Builder setIsFirstPassRewardTaken(boolean value) { return this; } /** - * bool is_first_pass_reward_taken = 2; + * bool is_first_pass_reward_taken = 13; * @return This builder for chaining. */ public Builder clearIsFirstPassRewardTaken() { @@ -905,37 +936,6 @@ public Builder clearIsFirstPassRewardTaken() { onChanged(); return this; } - - private boolean isOpen_ ; - /** - * bool is_open = 15; - * @return The isOpen. - */ - @java.lang.Override - public boolean getIsOpen() { - return isOpen_; - } - /** - * bool is_open = 15; - * @param value The isOpen to set. - * @return This builder for chaining. - */ - public Builder setIsOpen(boolean value) { - - isOpen_ = value; - onChanged(); - return this; - } - /** - * bool is_open = 15; - * @return This builder for chaining. - */ - public Builder clearIsOpen() { - - isOpen_ = false; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1004,11 +1004,11 @@ public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.Channel static { java.lang.String[] descriptorData = { "\n#ChannellerSlabLoopDungeonInfo.proto\"\255\001" + - "\n\035ChannellerSlabLoopDungeonInfo\022\021\n\topen_" + - "time\030\r \001(\r\022\r\n\005score\030\016 \001(\r\022\036\n\026last_condit" + - "ion_id_list\030\001 \003(\r\022\025\n\rdungeon_index\030\006 \001(\r" + - "\022\"\n\032is_first_pass_reward_taken\030\002 \001(\010\022\017\n\007" + - "is_open\030\017 \001(\010B\033\n\031emu.grasscutter.net.pro" + + "\n\035ChannellerSlabLoopDungeonInfo\022\017\n\007is_op" + + "en\030\004 \001(\010\022\r\n\005score\030\005 \001(\r\022\025\n\rdungeon_index" + + "\030\006 \001(\r\022\036\n\026last_condition_id_list\030\007 \003(\r\022\021" + + "\n\topen_time\030\010 \001(\r\022\"\n\032is_first_pass_rewar" + + "d_taken\030\r \001(\010B\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1020,7 +1020,7 @@ public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonInfoOuterClass.Channel internal_static_ChannellerSlabLoopDungeonInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ChannellerSlabLoopDungeonInfo_descriptor, - new java.lang.String[] { "OpenTime", "Score", "LastConditionIdList", "DungeonIndex", "IsFirstPassRewardTaken", "IsOpen", }); + new java.lang.String[] { "IsOpen", "Score", "DungeonIndex", "LastConditionIdList", "OpenTime", "IsFirstPassRewardTaken", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamReqOuterClass.java index c0f68a8a152..c39a864f85f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamReqOuterClass.java @@ -27,6 +27,7 @@ public interface ChooseCurAvatarTeamReqOrBuilder extends /** * 
    * CmdId: 29682
+   * obf: PCAFGAMHFOA
    *
* * Protobuf type {@code ChooseCurAvatarTeamReq} @@ -279,6 +280,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 29682
+     * obf: PCAFGAMHFOA
      *
* * Protobuf type {@code ChooseCurAvatarTeamReq} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamRspOuterClass.java index ef0173d4e65..b334ce90b88 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamRspOuterClass.java @@ -33,6 +33,8 @@ public interface ChooseCurAvatarTeamRspOrBuilder extends /** * 
    * CmdId: 5985
+   * 可能是 ChooseCurAvatarTeamRsp
+   * obf: EKAEAEABPHD
    *
* * Protobuf type {@code ChooseCurAvatarTeamRsp} @@ -312,6 +314,8 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 5985
+     * 可能是 ChooseCurAvatarTeamRsp
+     * obf: EKAEAEABPHD
      *
* * Protobuf type {@code ChooseCurAvatarTeamRsp} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientAIStateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientAIStateNotifyOuterClass.java index 2d6a0901b6a..39b3bc6d8e0 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ClientAIStateNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientAIStateNotifyOuterClass.java @@ -19,21 +19,21 @@ public interface ClientAIStateNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 cur_tactic = 5; + * uint32 cur_tactic = 11; * @return The curTactic. */ int getCurTactic(); /** - * uint32 entity_id = 13; + * uint32 entity_id = 14; * @return The entityId. */ int getEntityId(); } /** * 
-   * CmdId: 6944
-   * Obf: FCKHNNLKPOI
+   * CmdId: 5471
+   * obf: CPHLKODBAJJ
    *
* * Protobuf type {@code ClientAIStateNotify} @@ -80,12 +80,12 @@ private ClientAIStateNotify( case 0: done = true; break; - case 40: { + case 88: { curTactic_ = input.readUInt32(); break; } - case 104: { + case 112: { entityId_ = input.readUInt32(); break; @@ -122,10 +122,10 @@ private ClientAIStateNotify( emu.grasscutter.net.proto.ClientAIStateNotifyOuterClass.ClientAIStateNotify.class, emu.grasscutter.net.proto.ClientAIStateNotifyOuterClass.ClientAIStateNotify.Builder.class); } - public static final int CUR_TACTIC_FIELD_NUMBER = 5; + public static final int CUR_TACTIC_FIELD_NUMBER = 11; private int curTactic_; /** - * uint32 cur_tactic = 5; + * uint32 cur_tactic = 11; * @return The curTactic. */ @java.lang.Override @@ -133,10 +133,10 @@ public int getCurTactic() { return curTactic_; } - public static final int ENTITY_ID_FIELD_NUMBER = 13; + public static final int ENTITY_ID_FIELD_NUMBER = 14; private int entityId_; /** - * uint32 entity_id = 13; + * uint32 entity_id = 14; * @return The entityId. */ @java.lang.Override @@ -159,10 +159,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (curTactic_ != 0) { - output.writeUInt32(5, curTactic_); + output.writeUInt32(11, curTactic_); } if (entityId_ != 0) { - output.writeUInt32(13, entityId_); + output.writeUInt32(14, entityId_); } unknownFields.writeTo(output); } @@ -175,11 +175,11 @@ public int getSerializedSize() { size = 0; if (curTactic_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, curTactic_); + .computeUInt32Size(11, curTactic_); } if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, entityId_); + .computeUInt32Size(14, entityId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -312,8 +312,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 6944
-     * Obf: FCKHNNLKPOI
+     * CmdId: 5471
+     * obf: CPHLKODBAJJ
      *
* * Protobuf type {@code ClientAIStateNotify} @@ -470,7 +470,7 @@ public Builder mergeFrom( private int curTactic_ ; /** - * uint32 cur_tactic = 5; + * uint32 cur_tactic = 11; * @return The curTactic. */ @java.lang.Override @@ -478,7 +478,7 @@ public int getCurTactic() { return curTactic_; } /** - * uint32 cur_tactic = 5; + * uint32 cur_tactic = 11; * @param value The curTactic to set. * @return This builder for chaining. */ @@ -489,7 +489,7 @@ public Builder setCurTactic(int value) { return this; } /** - * uint32 cur_tactic = 5; + * uint32 cur_tactic = 11; * @return This builder for chaining. */ public Builder clearCurTactic() { @@ -501,7 +501,7 @@ public Builder clearCurTactic() { private int entityId_ ; /** - * uint32 entity_id = 13; + * uint32 entity_id = 14; * @return The entityId. */ @java.lang.Override @@ -509,7 +509,7 @@ public int getEntityId() { return entityId_; } /** - * uint32 entity_id = 13; + * uint32 entity_id = 14; * @param value The entityId to set. * @return This builder for chaining. */ @@ -520,7 +520,7 @@ public Builder setEntityId(int value) { return this; } /** - * uint32 entity_id = 13; + * uint32 entity_id = 14; * @return This builder for chaining. */ public Builder clearEntityId() { @@ -597,8 +597,8 @@ public emu.grasscutter.net.proto.ClientAIStateNotifyOuterClass.ClientAIStateNoti static { java.lang.String[] descriptorData = { "\n\031ClientAIStateNotify.proto\"<\n\023ClientAIS" + - "tateNotify\022\022\n\ncur_tactic\030\005 \001(\r\022\021\n\tentity" + - "_id\030\r \001(\rB\033\n\031emu.grasscutter.net.protob\006" + + "tateNotify\022\022\n\ncur_tactic\030\013 \001(\r\022\021\n\tentity" + + "_id\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006" + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilitiesInitFinishCombineNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilitiesInitFinishCombineNotifyOuterClass.java index f0553e3b98b..27e2577eced 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilitiesInitFinishCombineNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilitiesInitFinishCombineNotifyOuterClass.java @@ -19,33 +19,33 @@ public interface ClientAbilitiesInitFinishCombineNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ java.util.List getEntityInvokeListList(); /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry getEntityInvokeList(int index); /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ int getEntityInvokeListCount(); /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ java.util.List getEntityInvokeListOrBuilderList(); /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntryOrBuilder getEntityInvokeListOrBuilder( int index); } /** * 
-   * CmdId: 7505
-   * Obf: OLNCFNGPEFG
+   * CmdId: 6545
+   * obf: NJANIFAGALL
    *
* * Protobuf type {@code ClientAbilitiesInitFinishCombineNotify} @@ -94,7 +94,7 @@ private ClientAbilitiesInitFinishCombineNotify( case 0: done = true; break; - case 74: { + case 26: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { entityInvokeList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -138,17 +138,17 @@ private ClientAbilitiesInitFinishCombineNotify( emu.grasscutter.net.proto.ClientAbilitiesInitFinishCombineNotifyOuterClass.ClientAbilitiesInitFinishCombineNotify.class, emu.grasscutter.net.proto.ClientAbilitiesInitFinishCombineNotifyOuterClass.ClientAbilitiesInitFinishCombineNotify.Builder.class); } - public static final int ENTITY_INVOKE_LIST_FIELD_NUMBER = 9; + public static final int ENTITY_INVOKE_LIST_FIELD_NUMBER = 3; private java.util.List entityInvokeList_; /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ @java.lang.Override public java.util.List getEntityInvokeListList() { return entityInvokeList_; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ @java.lang.Override public java.util.List @@ -156,21 +156,21 @@ public java.util.Listrepeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ @java.lang.Override public int getEntityInvokeListCount() { return entityInvokeList_.size(); } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ @java.lang.Override public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry getEntityInvokeList(int index) { return entityInvokeList_.get(index); } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ @java.lang.Override public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntryOrBuilder getEntityInvokeListOrBuilder( @@ -193,7 +193,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < entityInvokeList_.size(); i++) { - output.writeMessage(9, entityInvokeList_.get(i)); + output.writeMessage(3, entityInvokeList_.get(i)); } unknownFields.writeTo(output); } @@ -206,7 +206,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < entityInvokeList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, entityInvokeList_.get(i)); + .computeMessageSize(3, entityInvokeList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -337,8 +337,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7505
-     * Obf: OLNCFNGPEFG
+     * CmdId: 6545
+     * obf: NJANIFAGALL
      *
* * Protobuf type {@code ClientAbilitiesInitFinishCombineNotify} @@ -538,7 +538,7 @@ private void ensureEntityInvokeListIsMutable() { emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntryOrBuilder> entityInvokeListBuilder_; /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public java.util.List getEntityInvokeListList() { if (entityInvokeListBuilder_ == null) { @@ -548,7 +548,7 @@ public java.util.Listrepeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public int getEntityInvokeListCount() { if (entityInvokeListBuilder_ == null) { @@ -558,7 +558,7 @@ public int getEntityInvokeListCount() { } } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry getEntityInvokeList(int index) { if (entityInvokeListBuilder_ == null) { @@ -568,7 +568,7 @@ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilit } } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder setEntityInvokeList( int index, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry value) { @@ -585,7 +585,7 @@ public Builder setEntityInvokeList( return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder setEntityInvokeList( int index, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder builderForValue) { @@ -599,7 +599,7 @@ public Builder setEntityInvokeList( return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder addEntityInvokeList(emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry value) { if (entityInvokeListBuilder_ == null) { @@ -615,7 +615,7 @@ public Builder addEntityInvokeList(emu.grasscutter.net.proto.EntityAbilityInvoke return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder addEntityInvokeList( int index, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry value) { @@ -632,7 +632,7 @@ public Builder addEntityInvokeList( return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder addEntityInvokeList( emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder builderForValue) { @@ -646,7 +646,7 @@ public Builder addEntityInvokeList( return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder addEntityInvokeList( int index, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder builderForValue) { @@ -660,7 +660,7 @@ public Builder addEntityInvokeList( return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder addAllEntityInvokeList( java.lang.Iterable values) { @@ -675,7 +675,7 @@ public Builder addAllEntityInvokeList( return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder clearEntityInvokeList() { if (entityInvokeListBuilder_ == null) { @@ -688,7 +688,7 @@ public Builder clearEntityInvokeList() { return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public Builder removeEntityInvokeList(int index) { if (entityInvokeListBuilder_ == null) { @@ -701,14 +701,14 @@ public Builder removeEntityInvokeList(int index) { return this; } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder getEntityInvokeListBuilder( int index) { return getEntityInvokeListFieldBuilder().getBuilder(index); } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntryOrBuilder getEntityInvokeListOrBuilder( int index) { @@ -718,7 +718,7 @@ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilit } } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public java.util.List getEntityInvokeListOrBuilderList() { @@ -729,14 +729,14 @@ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilit } } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder addEntityInvokeListBuilder() { return getEntityInvokeListFieldBuilder().addBuilder( emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.getDefaultInstance()); } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder addEntityInvokeListBuilder( int index) { @@ -744,7 +744,7 @@ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilit index, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.getDefaultInstance()); } /** - * repeated .EntityAbilityInvokeEntry entity_invoke_list = 9; + * repeated .EntityAbilityInvokeEntry entity_invoke_list = 3; */ public java.util.List getEntityInvokeListBuilderList() { @@ -834,7 +834,7 @@ public emu.grasscutter.net.proto.ClientAbilitiesInitFinishCombineNotifyOuterClas "\n,ClientAbilitiesInitFinishCombineNotify" + ".proto\032\036EntityAbilityInvokeEntry.proto\"_" + "\n&ClientAbilitiesInitFinishCombineNotify" + - "\0225\n\022entity_invoke_list\030\t \003(\0132\031.EntityAbi" + + "\0225\n\022entity_invoke_list\030\003 \003(\0132\031.EntityAbi" + "lityInvokeEntryB\033\n\031emu.grasscutter.net.p" + "rotob\006proto3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientQuitGameServerNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientQuitGameServerNotifyOuterClass.java new file mode 100644 index 00000000000..aa034552feb --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientQuitGameServerNotifyOuterClass.java @@ -0,0 +1,548 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: ClientQuitGameServerNotify.proto + +package emu.grasscutter.net.proto; + +public final class ClientQuitGameServerNotifyOuterClass { + private ClientQuitGameServerNotifyOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface ClientQuitGameServerNotifyOrBuilder extends + // @@protoc_insertion_point(interface_extends:ClientQuitGameServerNotify) + com.google.protobuf.MessageOrBuilder { + + /** + * bool MFBLIHCPIJN = 1; + * @return The mFBLIHCPIJN. + */ + boolean getMFBLIHCPIJN(); + } + /** + * 
+   * CmdId: 20600
+   * obf: MIMFBKCDIAK
+   *
+ * + * Protobuf type {@code ClientQuitGameServerNotify} + */ + public static final class ClientQuitGameServerNotify extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:ClientQuitGameServerNotify) + ClientQuitGameServerNotifyOrBuilder { + private static final long serialVersionUID = 0L; + // Use ClientQuitGameServerNotify.newBuilder() to construct. + private ClientQuitGameServerNotify(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ClientQuitGameServerNotify() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new ClientQuitGameServerNotify(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ClientQuitGameServerNotify( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + + mFBLIHCPIJN_ = input.readBool(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.internal_static_ClientQuitGameServerNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.internal_static_ClientQuitGameServerNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify.class, emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify.Builder.class); + } + + public static final int MFBLIHCPIJN_FIELD_NUMBER = 1; + private boolean mFBLIHCPIJN_; + /** + * bool MFBLIHCPIJN = 1; + * @return The mFBLIHCPIJN. + */ + @java.lang.Override + public boolean getMFBLIHCPIJN() { + return mFBLIHCPIJN_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (mFBLIHCPIJN_ != false) { + output.writeBool(1, mFBLIHCPIJN_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (mFBLIHCPIJN_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(1, mFBLIHCPIJN_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify other = (emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify) obj; + + if (getMFBLIHCPIJN() + != other.getMFBLIHCPIJN()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MFBLIHCPIJN_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getMFBLIHCPIJN()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * CmdId: 20600
+     * obf: MIMFBKCDIAK
+     *
+ * + * Protobuf type {@code ClientQuitGameServerNotify} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:ClientQuitGameServerNotify) + emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotifyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.internal_static_ClientQuitGameServerNotify_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.internal_static_ClientQuitGameServerNotify_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify.class, emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + mFBLIHCPIJN_ = false; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.internal_static_ClientQuitGameServerNotify_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify getDefaultInstanceForType() { + return emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify build() { + emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify buildPartial() { + emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify result = new emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify(this); + result.mFBLIHCPIJN_ = mFBLIHCPIJN_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify) { + return mergeFrom((emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify other) { + if (other == emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify.getDefaultInstance()) return this; + if (other.getMFBLIHCPIJN() != false) { + setMFBLIHCPIJN(other.getMFBLIHCPIJN()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private boolean mFBLIHCPIJN_ ; + /** + * bool MFBLIHCPIJN = 1; + * @return The mFBLIHCPIJN. + */ + @java.lang.Override + public boolean getMFBLIHCPIJN() { + return mFBLIHCPIJN_; + } + /** + * bool MFBLIHCPIJN = 1; + * @param value The mFBLIHCPIJN to set. + * @return This builder for chaining. + */ + public Builder setMFBLIHCPIJN(boolean value) { + + mFBLIHCPIJN_ = value; + onChanged(); + return this; + } + /** + * bool MFBLIHCPIJN = 1; + * @return This builder for chaining. + */ + public Builder clearMFBLIHCPIJN() { + + mFBLIHCPIJN_ = false; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:ClientQuitGameServerNotify) + } + + // @@protoc_insertion_point(class_scope:ClientQuitGameServerNotify) + private static final emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify(); + } + + public static emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public ClientQuitGameServerNotify parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ClientQuitGameServerNotify(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.ClientQuitGameServerNotifyOuterClass.ClientQuitGameServerNotify getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_ClientQuitGameServerNotify_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_ClientQuitGameServerNotify_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n ClientQuitGameServerNotify.proto\"1\n\032Cl" + + "ientQuitGameServerNotify\022\023\n\013MFBLIHCPIJN\030" + + "\001 \001(\010B\033\n\031emu.grasscutter.net.protob\006prot" + + "o3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_ClientQuitGameServerNotify_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_ClientQuitGameServerNotify_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_ClientQuitGameServerNotify_descriptor, + new java.lang.String[] { "MFBLIHCPIJN", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientScriptEventNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientScriptEventNotifyOuterClass.java index f2eb0737b8b..cc4dd75c541 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ClientScriptEventNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientScriptEventNotifyOuterClass.java @@ -19,44 +19,44 @@ public interface ClientScriptEventNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 source_entity_id = 14; - * @return The sourceEntityId. - */ - int getSourceEntityId(); - - /** - * uint32 target_entity_id = 1; - * @return The targetEntityId. - */ - int getTargetEntityId(); - - /** - * uint32 event_type = 4; - * @return The eventType. - */ - int getEventType(); - - /** - * repeated int32 param_list = 2; + * repeated int32 param_list = 1; * @return A list containing the paramList. */ java.util.List getParamListList(); /** - * repeated int32 param_list = 2; + * repeated int32 param_list = 1; * @return The count of paramList. */ int getParamListCount(); /** - * repeated int32 param_list = 2; + * repeated int32 param_list = 1; * @param index The index of the element to return. * @return The paramList at the given index. */ int getParamList(int index); + + /** + * uint32 target_entity_id = 14; + * @return The targetEntityId. + */ + int getTargetEntityId(); + + /** + * uint32 source_entity_id = 5; + * @return The sourceEntityId. + */ + int getSourceEntityId(); + + /** + * uint32 event_type = 12; + * @return The eventType. + */ + int getEventType(); } /** * 
-   * CmdId: 3165
-   * Obf: KPKNHHAMCOG
+   * CmdId: 29125
+   * obf: EMJHBHIPDDC
    *
* * Protobuf type {@code ClientScriptEventNotify} @@ -106,11 +106,6 @@ private ClientScriptEventNotify( done = true; break; case 8: { - - targetEntityId_ = input.readUInt32(); - break; - } - case 16: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { paramList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -118,7 +113,7 @@ private ClientScriptEventNotify( paramList_.addInt(input.readInt32()); break; } - case 18: { + case 10: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -131,14 +126,19 @@ private ClientScriptEventNotify( input.popLimit(limit); break; } - case 32: { + case 40: { + + sourceEntityId_ = input.readUInt32(); + break; + } + case 96: { eventType_ = input.readUInt32(); break; } case 112: { - sourceEntityId_ = input.readUInt32(); + targetEntityId_ = input.readUInt32(); break; } default: { @@ -176,43 +176,10 @@ private ClientScriptEventNotify( emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify.class, emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify.Builder.class); } - public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 14; - private int sourceEntityId_; - /** - * uint32 source_entity_id = 14; - * @return The sourceEntityId. - */ - @java.lang.Override - public int getSourceEntityId() { - return sourceEntityId_; - } - - public static final int TARGET_ENTITY_ID_FIELD_NUMBER = 1; - private int targetEntityId_; - /** - * uint32 target_entity_id = 1; - * @return The targetEntityId. - */ - @java.lang.Override - public int getTargetEntityId() { - return targetEntityId_; - } - - public static final int EVENT_TYPE_FIELD_NUMBER = 4; - private int eventType_; - /** - * uint32 event_type = 4; - * @return The eventType. - */ - @java.lang.Override - public int getEventType() { - return eventType_; - } - - public static final int PARAM_LIST_FIELD_NUMBER = 2; + public static final int PARAM_LIST_FIELD_NUMBER = 1; private com.google.protobuf.Internal.IntList paramList_; /** - * repeated int32 param_list = 2; + * repeated int32 param_list = 1; * @return A list containing the paramList. */ @java.lang.Override @@ -221,14 +188,14 @@ public int getEventType() { return paramList_; } /** - * repeated int32 param_list = 2; + * repeated int32 param_list = 1; * @return The count of paramList. */ public int getParamListCount() { return paramList_.size(); } /** - * repeated int32 param_list = 2; + * repeated int32 param_list = 1; * @param index The index of the element to return. * @return The paramList at the given index. */ @@ -237,6 +204,39 @@ public int getParamList(int index) { } private int paramListMemoizedSerializedSize = -1; + public static final int TARGET_ENTITY_ID_FIELD_NUMBER = 14; + private int targetEntityId_; + /** + * uint32 target_entity_id = 14; + * @return The targetEntityId. + */ + @java.lang.Override + public int getTargetEntityId() { + return targetEntityId_; + } + + public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 5; + private int sourceEntityId_; + /** + * uint32 source_entity_id = 5; + * @return The sourceEntityId. + */ + @java.lang.Override + public int getSourceEntityId() { + return sourceEntityId_; + } + + public static final int EVENT_TYPE_FIELD_NUMBER = 12; + private int eventType_; + /** + * uint32 event_type = 12; + * @return The eventType. + */ + @java.lang.Override + public int getEventType() { + return eventType_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -252,21 +252,21 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (targetEntityId_ != 0) { - output.writeUInt32(1, targetEntityId_); - } if (getParamListList().size() > 0) { - output.writeUInt32NoTag(18); + output.writeUInt32NoTag(10); output.writeUInt32NoTag(paramListMemoizedSerializedSize); } for (int i = 0; i < paramList_.size(); i++) { output.writeInt32NoTag(paramList_.getInt(i)); } + if (sourceEntityId_ != 0) { + output.writeUInt32(5, sourceEntityId_); + } if (eventType_ != 0) { - output.writeUInt32(4, eventType_); + output.writeUInt32(12, eventType_); } - if (sourceEntityId_ != 0) { - output.writeUInt32(14, sourceEntityId_); + if (targetEntityId_ != 0) { + output.writeUInt32(14, targetEntityId_); } unknownFields.writeTo(output); } @@ -277,10 +277,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (targetEntityId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, targetEntityId_); - } { int dataSize = 0; for (int i = 0; i < paramList_.size(); i++) { @@ -295,13 +291,17 @@ public int getSerializedSize() { } paramListMemoizedSerializedSize = dataSize; } + if (sourceEntityId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(5, sourceEntityId_); + } if (eventType_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, eventType_); + .computeUInt32Size(12, eventType_); } - if (sourceEntityId_ != 0) { + if (targetEntityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, sourceEntityId_); + .computeUInt32Size(14, targetEntityId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -318,14 +318,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify other = (emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify) obj; - if (getSourceEntityId() - != other.getSourceEntityId()) return false; + if (!getParamListList() + .equals(other.getParamListList())) return false; if (getTargetEntityId() != other.getTargetEntityId()) return false; + if (getSourceEntityId() + != other.getSourceEntityId()) return false; if (getEventType() != other.getEventType()) return false; - if (!getParamListList() - .equals(other.getParamListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -337,16 +337,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getSourceEntityId(); - hash = (37 * hash) + TARGET_ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getTargetEntityId(); - hash = (37 * hash) + EVENT_TYPE_FIELD_NUMBER; - hash = (53 * hash) + getEventType(); if (getParamListCount() > 0) { hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER; hash = (53 * hash) + getParamListList().hashCode(); } + hash = (37 * hash) + TARGET_ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getTargetEntityId(); + hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getSourceEntityId(); + hash = (37 * hash) + EVENT_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getEventType(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -444,8 +444,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 3165
-     * Obf: KPKNHHAMCOG
+     * CmdId: 29125
+     * obf: EMJHBHIPDDC
      *
* * Protobuf type {@code ClientScriptEventNotify} @@ -485,14 +485,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - sourceEntityId_ = 0; - + paramList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); targetEntityId_ = 0; + sourceEntityId_ = 0; + eventType_ = 0; - paramList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -520,14 +520,14 @@ public emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptE public emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify buildPartial() { emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify result = new emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify(this); int from_bitField0_ = bitField0_; - result.sourceEntityId_ = sourceEntityId_; - result.targetEntityId_ = targetEntityId_; - result.eventType_ = eventType_; if (((bitField0_ & 0x00000001) != 0)) { paramList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.paramList_ = paramList_; + result.targetEntityId_ = targetEntityId_; + result.sourceEntityId_ = sourceEntityId_; + result.eventType_ = eventType_; onBuilt(); return result; } @@ -576,15 +576,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify other) { if (other == emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptEventNotify.getDefaultInstance()) return this; - if (other.getSourceEntityId() != 0) { - setSourceEntityId(other.getSourceEntityId()); - } - if (other.getTargetEntityId() != 0) { - setTargetEntityId(other.getTargetEntityId()); - } - if (other.getEventType() != 0) { - setEventType(other.getEventType()); - } if (!other.paramList_.isEmpty()) { if (paramList_.isEmpty()) { paramList_ = other.paramList_; @@ -595,6 +586,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ClientScriptEventNotifyOuterC } onChanged(); } + if (other.getTargetEntityId() != 0) { + setTargetEntityId(other.getTargetEntityId()); + } + if (other.getSourceEntityId() != 0) { + setSourceEntityId(other.getSourceEntityId()); + } + if (other.getEventType() != 0) { + setEventType(other.getEventType()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -625,40 +625,88 @@ public Builder mergeFrom( } private int bitField0_; - private int sourceEntityId_ ; + private com.google.protobuf.Internal.IntList paramList_ = emptyIntList(); + private void ensureParamListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + paramList_ = mutableCopy(paramList_); + bitField0_ |= 0x00000001; + } + } /** - * uint32 source_entity_id = 14; - * @return The sourceEntityId. + * repeated int32 param_list = 1; + * @return A list containing the paramList. */ - @java.lang.Override - public int getSourceEntityId() { - return sourceEntityId_; + public java.util.List + getParamListList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(paramList_) : paramList_; } /** - * uint32 source_entity_id = 14; - * @param value The sourceEntityId to set. + * repeated int32 param_list = 1; + * @return The count of paramList. + */ + public int getParamListCount() { + return paramList_.size(); + } + /** + * repeated int32 param_list = 1; + * @param index The index of the element to return. + * @return The paramList at the given index. + */ + public int getParamList(int index) { + return paramList_.getInt(index); + } + /** + * repeated int32 param_list = 1; + * @param index The index to set the value at. + * @param value The paramList to set. * @return This builder for chaining. */ - public Builder setSourceEntityId(int value) { - - sourceEntityId_ = value; + public Builder setParamList( + int index, int value) { + ensureParamListIsMutable(); + paramList_.setInt(index, value); onChanged(); return this; } /** - * uint32 source_entity_id = 14; + * repeated int32 param_list = 1; + * @param value The paramList to add. * @return This builder for chaining. */ - public Builder clearSourceEntityId() { - - sourceEntityId_ = 0; + public Builder addParamList(int value) { + ensureParamListIsMutable(); + paramList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated int32 param_list = 1; + * @param values The paramList to add. + * @return This builder for chaining. + */ + public Builder addAllParamList( + java.lang.Iterable values) { + ensureParamListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, paramList_); + onChanged(); + return this; + } + /** + * repeated int32 param_list = 1; + * @return This builder for chaining. + */ + public Builder clearParamList() { + paramList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } private int targetEntityId_ ; /** - * uint32 target_entity_id = 1; + * uint32 target_entity_id = 14; * @return The targetEntityId. */ @java.lang.Override @@ -666,7 +714,7 @@ public int getTargetEntityId() { return targetEntityId_; } /** - * uint32 target_entity_id = 1; + * uint32 target_entity_id = 14; * @param value The targetEntityId to set. * @return This builder for chaining. */ @@ -677,7 +725,7 @@ public Builder setTargetEntityId(int value) { return this; } /** - * uint32 target_entity_id = 1; + * uint32 target_entity_id = 14; * @return This builder for chaining. */ public Builder clearTargetEntityId() { @@ -687,112 +735,64 @@ public Builder clearTargetEntityId() { return this; } - private int eventType_ ; + private int sourceEntityId_ ; /** - * uint32 event_type = 4; - * @return The eventType. + * uint32 source_entity_id = 5; + * @return The sourceEntityId. */ @java.lang.Override - public int getEventType() { - return eventType_; + public int getSourceEntityId() { + return sourceEntityId_; } /** - * uint32 event_type = 4; - * @param value The eventType to set. + * uint32 source_entity_id = 5; + * @param value The sourceEntityId to set. * @return This builder for chaining. */ - public Builder setEventType(int value) { + public Builder setSourceEntityId(int value) { - eventType_ = value; + sourceEntityId_ = value; onChanged(); return this; } /** - * uint32 event_type = 4; + * uint32 source_entity_id = 5; * @return This builder for chaining. */ - public Builder clearEventType() { + public Builder clearSourceEntityId() { - eventType_ = 0; + sourceEntityId_ = 0; onChanged(); return this; } - private com.google.protobuf.Internal.IntList paramList_ = emptyIntList(); - private void ensureParamListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - paramList_ = mutableCopy(paramList_); - bitField0_ |= 0x00000001; - } - } - /** - * repeated int32 param_list = 2; - * @return A list containing the paramList. - */ - public java.util.List - getParamListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(paramList_) : paramList_; - } - /** - * repeated int32 param_list = 2; - * @return The count of paramList. - */ - public int getParamListCount() { - return paramList_.size(); - } - /** - * repeated int32 param_list = 2; - * @param index The index of the element to return. - * @return The paramList at the given index. - */ - public int getParamList(int index) { - return paramList_.getInt(index); - } - /** - * repeated int32 param_list = 2; - * @param index The index to set the value at. - * @param value The paramList to set. - * @return This builder for chaining. - */ - public Builder setParamList( - int index, int value) { - ensureParamListIsMutable(); - paramList_.setInt(index, value); - onChanged(); - return this; - } + private int eventType_ ; /** - * repeated int32 param_list = 2; - * @param value The paramList to add. - * @return This builder for chaining. + * uint32 event_type = 12; + * @return The eventType. */ - public Builder addParamList(int value) { - ensureParamListIsMutable(); - paramList_.addInt(value); - onChanged(); - return this; + @java.lang.Override + public int getEventType() { + return eventType_; } /** - * repeated int32 param_list = 2; - * @param values The paramList to add. + * uint32 event_type = 12; + * @param value The eventType to set. * @return This builder for chaining. */ - public Builder addAllParamList( - java.lang.Iterable values) { - ensureParamListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, paramList_); + public Builder setEventType(int value) { + + eventType_ = value; onChanged(); return this; } /** - * repeated int32 param_list = 2; + * uint32 event_type = 12; * @return This builder for chaining. */ - public Builder clearParamList() { - paramList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder clearEventType() { + + eventType_ = 0; onChanged(); return this; } @@ -864,9 +864,9 @@ public emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptE static { java.lang.String[] descriptorData = { "\n\035ClientScriptEventNotify.proto\"u\n\027Clien" + - "tScriptEventNotify\022\030\n\020source_entity_id\030\016" + - " \001(\r\022\030\n\020target_entity_id\030\001 \001(\r\022\022\n\nevent_" + - "type\030\004 \001(\r\022\022\n\nparam_list\030\002 \003(\005B\033\n\031emu.gr" + + "tScriptEventNotify\022\022\n\nparam_list\030\001 \003(\005\022\030" + + "\n\020target_entity_id\030\016 \001(\r\022\030\n\020source_entit" + + "y_id\030\005 \001(\r\022\022\n\nevent_type\030\014 \001(\rB\033\n\031emu.gr" + "asscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -878,7 +878,7 @@ public emu.grasscutter.net.proto.ClientScriptEventNotifyOuterClass.ClientScriptE internal_static_ClientScriptEventNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ClientScriptEventNotify_descriptor, - new java.lang.String[] { "SourceEntityId", "TargetEntityId", "EventType", "ParamList", }); + new java.lang.String[] { "ParamList", "TargetEntityId", "SourceEntityId", "EventType", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CombineFormulaDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CombineFormulaDataNotifyOuterClass.java index aaf816c37cd..2c8dd932821 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CombineFormulaDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CombineFormulaDataNotifyOuterClass.java @@ -19,21 +19,21 @@ public interface CombineFormulaDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 combine_id = 14; - * @return The combineId. + * bool is_locked = 5; + * @return The isLocked. */ - int getCombineId(); + boolean getIsLocked(); /** - * bool is_locked = 7; - * @return The isLocked. + * uint32 combine_id = 15; + * @return The combineId. */ - boolean getIsLocked(); + int getCombineId(); } /** * 
-   * CmdId: 25832
-   * Obf: CCMFELEODNK
+   * CmdId: 9746
+   * obf: PNJEJKHILNO
    *
* * Protobuf type {@code CombineFormulaDataNotify} @@ -80,12 +80,12 @@ private CombineFormulaDataNotify( case 0: done = true; break; - case 56: { + case 40: { isLocked_ = input.readBool(); break; } - case 112: { + case 120: { combineId_ = input.readUInt32(); break; @@ -122,26 +122,26 @@ private CombineFormulaDataNotify( emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify.class, emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify.Builder.class); } - public static final int COMBINE_ID_FIELD_NUMBER = 14; - private int combineId_; + public static final int IS_LOCKED_FIELD_NUMBER = 5; + private boolean isLocked_; /** - * uint32 combine_id = 14; - * @return The combineId. + * bool is_locked = 5; + * @return The isLocked. */ @java.lang.Override - public int getCombineId() { - return combineId_; + public boolean getIsLocked() { + return isLocked_; } - public static final int IS_LOCKED_FIELD_NUMBER = 7; - private boolean isLocked_; + public static final int COMBINE_ID_FIELD_NUMBER = 15; + private int combineId_; /** - * bool is_locked = 7; - * @return The isLocked. + * uint32 combine_id = 15; + * @return The combineId. */ @java.lang.Override - public boolean getIsLocked() { - return isLocked_; + public int getCombineId() { + return combineId_; } private byte memoizedIsInitialized = -1; @@ -159,10 +159,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (isLocked_ != false) { - output.writeBool(7, isLocked_); + output.writeBool(5, isLocked_); } if (combineId_ != 0) { - output.writeUInt32(14, combineId_); + output.writeUInt32(15, combineId_); } unknownFields.writeTo(output); } @@ -175,11 +175,11 @@ public int getSerializedSize() { size = 0; if (isLocked_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, isLocked_); + .computeBoolSize(5, isLocked_); } if (combineId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, combineId_); + .computeUInt32Size(15, combineId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +196,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify other = (emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify) obj; - if (getCombineId() - != other.getCombineId()) return false; if (getIsLocked() != other.getIsLocked()) return false; + if (getCombineId() + != other.getCombineId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,11 +211,11 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + COMBINE_ID_FIELD_NUMBER; - hash = (53 * hash) + getCombineId(); hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsLocked()); + hash = (37 * hash) + COMBINE_ID_FIELD_NUMBER; + hash = (53 * hash) + getCombineId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -313,8 +313,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25832
-     * Obf: CCMFELEODNK
+     * CmdId: 9746
+     * obf: PNJEJKHILNO
      *
* * Protobuf type {@code CombineFormulaDataNotify} @@ -354,10 +354,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - combineId_ = 0; - isLocked_ = false; + combineId_ = 0; + return this; } @@ -384,8 +384,8 @@ public emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormu @java.lang.Override public emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify buildPartial() { emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify result = new emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify(this); - result.combineId_ = combineId_; result.isLocked_ = isLocked_; + result.combineId_ = combineId_; onBuilt(); return result; } @@ -434,12 +434,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify other) { if (other == emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormulaDataNotify.getDefaultInstance()) return this; - if (other.getCombineId() != 0) { - setCombineId(other.getCombineId()); - } if (other.getIsLocked() != false) { setIsLocked(other.getIsLocked()); } + if (other.getCombineId() != 0) { + setCombineId(other.getCombineId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -469,64 +469,64 @@ public Builder mergeFrom( return this; } - private int combineId_ ; + private boolean isLocked_ ; /** - * uint32 combine_id = 14; - * @return The combineId. + * bool is_locked = 5; + * @return The isLocked. */ @java.lang.Override - public int getCombineId() { - return combineId_; + public boolean getIsLocked() { + return isLocked_; } /** - * uint32 combine_id = 14; - * @param value The combineId to set. + * bool is_locked = 5; + * @param value The isLocked to set. * @return This builder for chaining. */ - public Builder setCombineId(int value) { + public Builder setIsLocked(boolean value) { - combineId_ = value; + isLocked_ = value; onChanged(); return this; } /** - * uint32 combine_id = 14; + * bool is_locked = 5; * @return This builder for chaining. */ - public Builder clearCombineId() { + public Builder clearIsLocked() { - combineId_ = 0; + isLocked_ = false; onChanged(); return this; } - private boolean isLocked_ ; + private int combineId_ ; /** - * bool is_locked = 7; - * @return The isLocked. + * uint32 combine_id = 15; + * @return The combineId. */ @java.lang.Override - public boolean getIsLocked() { - return isLocked_; + public int getCombineId() { + return combineId_; } /** - * bool is_locked = 7; - * @param value The isLocked to set. + * uint32 combine_id = 15; + * @param value The combineId to set. * @return This builder for chaining. */ - public Builder setIsLocked(boolean value) { + public Builder setCombineId(int value) { - isLocked_ = value; + combineId_ = value; onChanged(); return this; } /** - * bool is_locked = 7; + * uint32 combine_id = 15; * @return This builder for chaining. */ - public Builder clearIsLocked() { + public Builder clearCombineId() { - isLocked_ = false; + combineId_ = 0; onChanged(); return this; } @@ -598,8 +598,8 @@ public emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormu static { java.lang.String[] descriptorData = { "\n\036CombineFormulaDataNotify.proto\"A\n\030Comb" + - "ineFormulaDataNotify\022\022\n\ncombine_id\030\016 \001(\r" + - "\022\021\n\tis_locked\030\007 \001(\010B\033\n\031emu.grasscutter.n" + + "ineFormulaDataNotify\022\021\n\tis_locked\030\005 \001(\010\022" + + "\022\n\ncombine_id\030\017 \001(\rB\033\n\031emu.grasscutter.n" + "et.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -611,7 +611,7 @@ public emu.grasscutter.net.proto.CombineFormulaDataNotifyOuterClass.CombineFormu internal_static_CombineFormulaDataNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CombineFormulaDataNotify_descriptor, - new java.lang.String[] { "CombineId", "IsLocked", }); + new java.lang.String[] { "IsLocked", "CombineId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CombineReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CombineReqOuterClass.java index d63b1437ee3..99010595051 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CombineReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CombineReqOuterClass.java @@ -18,12 +18,6 @@ public interface CombineReqOrBuilder extends // @@protoc_insertion_point(interface_extends:CombineReq) com.google.protobuf.MessageOrBuilder { - /** - * uint32 combine_count = 5; - * @return The combineCount. - */ - int getCombineCount(); - /** * uint64 avatar_guid = 2; * @return The avatarGuid. @@ -31,15 +25,21 @@ public interface CombineReqOrBuilder extends long getAvatarGuid(); /** - * uint32 combine_id = 3; + * uint32 combine_count = 10; + * @return The combineCount. + */ + int getCombineCount(); + + /** + * uint32 combine_id = 9; * @return The combineId. */ int getCombineId(); } /** * 
-   * CmdId: 753
-   * Obf: JIBOADJOLAM
+   * CmdId: 21559
+   * obf: IKCKGINNCBB
    *
* * Protobuf type {@code CombineReq} @@ -91,12 +91,12 @@ private CombineReq( avatarGuid_ = input.readUInt64(); break; } - case 24: { + case 72: { combineId_ = input.readUInt32(); break; } - case 40: { + case 80: { combineCount_ = input.readUInt32(); break; @@ -133,17 +133,6 @@ private CombineReq( emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq.class, emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq.Builder.class); } - public static final int COMBINE_COUNT_FIELD_NUMBER = 5; - private int combineCount_; - /** - * uint32 combine_count = 5; - * @return The combineCount. - */ - @java.lang.Override - public int getCombineCount() { - return combineCount_; - } - public static final int AVATAR_GUID_FIELD_NUMBER = 2; private long avatarGuid_; /** @@ -155,10 +144,21 @@ public long getAvatarGuid() { return avatarGuid_; } - public static final int COMBINE_ID_FIELD_NUMBER = 3; + public static final int COMBINE_COUNT_FIELD_NUMBER = 10; + private int combineCount_; + /** + * uint32 combine_count = 10; + * @return The combineCount. + */ + @java.lang.Override + public int getCombineCount() { + return combineCount_; + } + + public static final int COMBINE_ID_FIELD_NUMBER = 9; private int combineId_; /** - * uint32 combine_id = 3; + * uint32 combine_id = 9; * @return The combineId. */ @java.lang.Override @@ -184,10 +184,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeUInt64(2, avatarGuid_); } if (combineId_ != 0) { - output.writeUInt32(3, combineId_); + output.writeUInt32(9, combineId_); } if (combineCount_ != 0) { - output.writeUInt32(5, combineCount_); + output.writeUInt32(10, combineCount_); } unknownFields.writeTo(output); } @@ -204,11 +204,11 @@ public int getSerializedSize() { } if (combineId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, combineId_); + .computeUInt32Size(9, combineId_); } if (combineCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, combineCount_); + .computeUInt32Size(10, combineCount_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,10 +225,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq other = (emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq) obj; - if (getCombineCount() - != other.getCombineCount()) return false; if (getAvatarGuid() != other.getAvatarGuid()) return false; + if (getCombineCount() + != other.getCombineCount()) return false; if (getCombineId() != other.getCombineId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -242,11 +242,11 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + COMBINE_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getCombineCount(); hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); + hash = (37 * hash) + COMBINE_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getCombineCount(); hash = (37 * hash) + COMBINE_ID_FIELD_NUMBER; hash = (53 * hash) + getCombineId(); hash = (29 * hash) + unknownFields.hashCode(); @@ -346,8 +346,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 753
-     * Obf: JIBOADJOLAM
+     * CmdId: 21559
+     * obf: IKCKGINNCBB
      *
* * Protobuf type {@code CombineReq} @@ -387,10 +387,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - combineCount_ = 0; - avatarGuid_ = 0L; + combineCount_ = 0; + combineId_ = 0; return this; @@ -419,8 +419,8 @@ public emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq build() { @java.lang.Override public emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq buildPartial() { emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq result = new emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq(this); - result.combineCount_ = combineCount_; result.avatarGuid_ = avatarGuid_; + result.combineCount_ = combineCount_; result.combineId_ = combineId_; onBuilt(); return result; @@ -470,12 +470,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq other) { if (other == emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq.getDefaultInstance()) return this; - if (other.getCombineCount() != 0) { - setCombineCount(other.getCombineCount()); - } if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } + if (other.getCombineCount() != 0) { + setCombineCount(other.getCombineCount()); + } if (other.getCombineId() != 0) { setCombineId(other.getCombineId()); } @@ -508,71 +508,71 @@ public Builder mergeFrom( return this; } - private int combineCount_ ; + private long avatarGuid_ ; /** - * uint32 combine_count = 5; - * @return The combineCount. + * uint64 avatar_guid = 2; + * @return The avatarGuid. */ @java.lang.Override - public int getCombineCount() { - return combineCount_; + public long getAvatarGuid() { + return avatarGuid_; } /** - * uint32 combine_count = 5; - * @param value The combineCount to set. + * uint64 avatar_guid = 2; + * @param value The avatarGuid to set. * @return This builder for chaining. */ - public Builder setCombineCount(int value) { + public Builder setAvatarGuid(long value) { - combineCount_ = value; + avatarGuid_ = value; onChanged(); return this; } /** - * uint32 combine_count = 5; + * uint64 avatar_guid = 2; * @return This builder for chaining. */ - public Builder clearCombineCount() { + public Builder clearAvatarGuid() { - combineCount_ = 0; + avatarGuid_ = 0L; onChanged(); return this; } - private long avatarGuid_ ; + private int combineCount_ ; /** - * uint64 avatar_guid = 2; - * @return The avatarGuid. + * uint32 combine_count = 10; + * @return The combineCount. */ @java.lang.Override - public long getAvatarGuid() { - return avatarGuid_; + public int getCombineCount() { + return combineCount_; } /** - * uint64 avatar_guid = 2; - * @param value The avatarGuid to set. + * uint32 combine_count = 10; + * @param value The combineCount to set. * @return This builder for chaining. */ - public Builder setAvatarGuid(long value) { + public Builder setCombineCount(int value) { - avatarGuid_ = value; + combineCount_ = value; onChanged(); return this; } /** - * uint64 avatar_guid = 2; + * uint32 combine_count = 10; * @return This builder for chaining. */ - public Builder clearAvatarGuid() { + public Builder clearCombineCount() { - avatarGuid_ = 0L; + combineCount_ = 0; onChanged(); return this; } private int combineId_ ; /** - * uint32 combine_id = 3; + * uint32 combine_id = 9; * @return The combineId. */ @java.lang.Override @@ -580,7 +580,7 @@ public int getCombineId() { return combineId_; } /** - * uint32 combine_id = 3; + * uint32 combine_id = 9; * @param value The combineId to set. * @return This builder for chaining. */ @@ -591,7 +591,7 @@ public Builder setCombineId(int value) { return this; } /** - * uint32 combine_id = 3; + * uint32 combine_id = 9; * @return This builder for chaining. */ public Builder clearCombineId() { @@ -667,9 +667,9 @@ public emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq getDefaultInsta descriptor; static { java.lang.String[] descriptorData = { - "\n\020CombineReq.proto\"L\n\nCombineReq\022\025\n\rcomb" + - "ine_count\030\005 \001(\r\022\023\n\013avatar_guid\030\002 \001(\004\022\022\n\n" + - "combine_id\030\003 \001(\rB\033\n\031emu.grasscutter.net." + + "\n\020CombineReq.proto\"L\n\nCombineReq\022\023\n\013avat" + + "ar_guid\030\002 \001(\004\022\025\n\rcombine_count\030\n \001(\r\022\022\n\n" + + "combine_id\030\t \001(\rB\033\n\031emu.grasscutter.net." + "protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +681,7 @@ public emu.grasscutter.net.proto.CombineReqOuterClass.CombineReq getDefaultInsta internal_static_CombineReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CombineReq_descriptor, - new java.lang.String[] { "CombineCount", "AvatarGuid", "CombineId", }); + new java.lang.String[] { "AvatarGuid", "CombineCount", "CombineId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CombineRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CombineRspOuterClass.java index 6b2e442cb79..b88800376f3 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CombineRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CombineRspOuterClass.java @@ -19,177 +19,277 @@ public interface CombineRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 combine_id = 7; + * uint32 combine_id = 1; * @return The combineId. */ int getCombineId(); /** - * uint32 combine_count = 3; - * @return The combineCount. - */ - int getCombineCount(); - - /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ java.util.List getTotalExtraItemListList(); /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index); /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ int getTotalExtraItemListCount(); /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ java.util.List getTotalExtraItemListOrBuilderList(); /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder( int index); /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ java.util.List getTotalReturnItemListList(); /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index); /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ int getTotalReturnItemListCount(); /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ java.util.List getTotalReturnItemListOrBuilderList(); /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder( int index); /** - * repeated .ItemParam totalRandomItemList = 11; + * uint32 combine_count = 7; + * @return The combineCount. + */ + int getCombineCount(); + + /** + * int32 retcode = 8; + * @return The retcode. + */ + int getRetcode(); + + /** + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ java.util.List getTotalRandomItemListList(); /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index); /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ int getTotalRandomItemListCount(); /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ java.util.List getTotalRandomItemListOrBuilderList(); /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( int index); /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ java.util.List - getUk10List(); + getCostItemListList(); /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index); + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index); /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - int getUk10Count(); + int getCostItemListCount(); /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ java.util.List - getUk10OrBuilderList(); + getCostItemListOrBuilderList(); /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder( int index); /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 12; * @return The avatarGuid. */ long getAvatarGuid(); /** - * int32 retcode = 6; - * @return The retcode. - */ - int getRetcode(); - - /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ java.util.List - getResultItemListList(); + getUk10List(); /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index); + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index); /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ - int getResultItemListCount(); + int getUk10Count(); /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ java.util.List - getResultItemListOrBuilderList(); + getUk10OrBuilderList(); /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( int index); /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ java.util.List - getCostItemListList(); + getResultItemListList(); /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index); + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index); /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ - int getCostItemListCount(); + int getResultItemListCount(); /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ java.util.List - getCostItemListOrBuilderList(); + getResultItemListOrBuilderList(); /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( int index); } /** * 
-   * CmdId: 27346
-   * Obf: FPLEFMOIOGE
+   * CmdId: 29627
+   * obf: EIHMBDMBJGO
    *
* * Protobuf type {@code CombineRsp} @@ -207,9 +307,9 @@ private CombineRsp() { totalExtraItemList_ = java.util.Collections.emptyList(); totalReturnItemList_ = java.util.Collections.emptyList(); totalRandomItemList_ = java.util.Collections.emptyList(); + costItemList_ = java.util.Collections.emptyList(); uk10_ = java.util.Collections.emptyList(); resultItemList_ = java.util.Collections.emptyList(); - costItemList_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -243,77 +343,77 @@ private CombineRsp( case 0: done = true; break; - case 24: { + case 8: { - combineCount_ = input.readUInt32(); + combineId_ = input.readUInt32(); break; } - case 34: { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - costItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; + case 26: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + totalExtraItemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - costItemList_.add( + totalExtraItemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 40: { - - avatarGuid_ = input.readUInt64(); + case 34: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + totalReturnItemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + totalReturnItemList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 48: { + case 56: { - retcode_ = input.readInt32(); + combineCount_ = input.readUInt32(); break; } - case 56: { + case 64: { - combineId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 66: { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - resultItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; + case 74: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + totalRandomItemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; } - resultItemList_.add( + totalRandomItemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } case 82: { if (!((mutable_bitField0_ & 0x00000008) != 0)) { - uk10_ = new java.util.ArrayList(); + costItemList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } - uk10_.add( + costItemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 90: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - totalRandomItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - totalRandomItemList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + case 96: { + + avatarGuid_ = input.readUInt64(); break; } case 106: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - totalExtraItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + if (!((mutable_bitField0_ & 0x00000010) != 0)) { + uk10_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000010; } - totalExtraItemList_.add( + uk10_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } case 122: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - totalReturnItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; + if (!((mutable_bitField0_ & 0x00000020) != 0)) { + resultItemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000020; } - totalReturnItemList_.add( + resultItemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } @@ -332,23 +432,23 @@ private CombineRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) != 0)) { - costItemList_ = java.util.Collections.unmodifiableList(costItemList_); - } - if (((mutable_bitField0_ & 0x00000010) != 0)) { - resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_); + if (((mutable_bitField0_ & 0x00000001) != 0)) { + totalExtraItemList_ = java.util.Collections.unmodifiableList(totalExtraItemList_); } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - uk10_ = java.util.Collections.unmodifiableList(uk10_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + totalReturnItemList_ = java.util.Collections.unmodifiableList(totalReturnItemList_); } if (((mutable_bitField0_ & 0x00000004) != 0)) { totalRandomItemList_ = java.util.Collections.unmodifiableList(totalRandomItemList_); } - if (((mutable_bitField0_ & 0x00000001) != 0)) { - totalExtraItemList_ = java.util.Collections.unmodifiableList(totalExtraItemList_); + if (((mutable_bitField0_ & 0x00000008) != 0)) { + costItemList_ = java.util.Collections.unmodifiableList(costItemList_); } - if (((mutable_bitField0_ & 0x00000002) != 0)) { - totalReturnItemList_ = java.util.Collections.unmodifiableList(totalReturnItemList_); + if (((mutable_bitField0_ & 0x00000010) != 0)) { + uk10_ = java.util.Collections.unmodifiableList(uk10_); + } + if (((mutable_bitField0_ & 0x00000020) != 0)) { + resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -367,10 +467,10 @@ private CombineRsp( emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp.class, emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp.Builder.class); } - public static final int COMBINE_ID_FIELD_NUMBER = 7; + public static final int COMBINE_ID_FIELD_NUMBER = 1; private int combineId_; /** - * uint32 combine_id = 7; + * uint32 combine_id = 1; * @return The combineId. */ @java.lang.Override @@ -378,28 +478,25 @@ public int getCombineId() { return combineId_; } - public static final int COMBINE_COUNT_FIELD_NUMBER = 3; - private int combineCount_; - /** - * uint32 combine_count = 3; - * @return The combineCount. - */ - @java.lang.Override - public int getCombineCount() { - return combineCount_; - } - - public static final int TOTALEXTRAITEMLIST_FIELD_NUMBER = 13; + public static final int TOTALEXTRAITEMLIST_FIELD_NUMBER = 3; private java.util.List totalExtraItemList_; /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ @java.lang.Override public java.util.List getTotalExtraItemListList() { return totalExtraItemList_; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ @java.lang.Override public java.util.List @@ -407,21 +504,33 @@ public java.util.List g return totalExtraItemList_; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ @java.lang.Override public int getTotalExtraItemListCount() { return totalExtraItemList_.size(); } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index) { return totalExtraItemList_.get(index); } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+     * obf: DIPIPCANMFM 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder( @@ -429,17 +538,25 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal return totalExtraItemList_.get(index); } - public static final int TOTAL_RETURN_ITEM_LIST_FIELD_NUMBER = 15; + public static final int TOTAL_RETURN_ITEM_LIST_FIELD_NUMBER = 4; private java.util.List totalReturnItemList_; /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ @java.lang.Override public java.util.List getTotalReturnItemListList() { return totalReturnItemList_; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ @java.lang.Override public java.util.List @@ -447,21 +564,33 @@ public java.util.List g return totalReturnItemList_; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ @java.lang.Override public int getTotalReturnItemListCount() { return totalReturnItemList_.size(); } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index) { return totalReturnItemList_.get(index); } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+     * obf: FNNHLPFGPIN 解出来的可能不对
+     *
+ * + * repeated .ItemParam total_return_item_list = 4; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder( @@ -469,17 +598,47 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal return totalReturnItemList_.get(index); } - public static final int TOTALRANDOMITEMLIST_FIELD_NUMBER = 11; - private java.util.List totalRandomItemList_; + public static final int COMBINE_COUNT_FIELD_NUMBER = 7; + private int combineCount_; /** - * repeated .ItemParam totalRandomItemList = 11; + * uint32 combine_count = 7; + * @return The combineCount. */ @java.lang.Override - public java.util.List getTotalRandomItemListList() { - return totalRandomItemList_; - } + public int getCombineCount() { + return combineCount_; + } + + public static final int RETCODE_FIELD_NUMBER = 8; + private int retcode_; + /** + * int32 retcode = 8; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int TOTALRANDOMITEMLIST_FIELD_NUMBER = 9; + private java.util.List totalRandomItemList_; + /** + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; + */ + @java.lang.Override + public java.util.List getTotalRandomItemListList() { + return totalRandomItemList_; + } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ @java.lang.Override public java.util.List @@ -487,21 +646,33 @@ public java.util.List g return totalRandomItemList_; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ @java.lang.Override public int getTotalRandomItemListCount() { return totalRandomItemList_.size(); } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index) { return totalRandomItemList_.get(index); } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+     * obf: LLOJHCEIBGO 解出来的可能不对
+     *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( @@ -509,50 +680,50 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal return totalRandomItemList_.get(index); } - public static final int UK10_FIELD_NUMBER = 10; - private java.util.List uk10_; + public static final int COST_ITEM_LIST_FIELD_NUMBER = 10; + private java.util.List costItemList_; /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ @java.lang.Override - public java.util.List getUk10List() { - return uk10_; + public java.util.List getCostItemListList() { + return costItemList_; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ @java.lang.Override public java.util.List - getUk10OrBuilderList() { - return uk10_; + getCostItemListOrBuilderList() { + return costItemList_; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ @java.lang.Override - public int getUk10Count() { - return uk10_.size(); + public int getCostItemListCount() { + return costItemList_.size(); } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index) { - return uk10_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index) { + return costItemList_.get(index); } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder( int index) { - return uk10_.get(index); + return costItemList_.get(index); } - public static final int AVATAR_GUID_FIELD_NUMBER = 5; + public static final int AVATAR_GUID_FIELD_NUMBER = 12; private long avatarGuid_; /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 12; * @return The avatarGuid. */ @java.lang.Override @@ -560,95 +731,124 @@ public long getAvatarGuid() { return avatarGuid_; } - public static final int RETCODE_FIELD_NUMBER = 6; - private int retcode_; - /** - * int32 retcode = 6; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int RESULT_ITEM_LIST_FIELD_NUMBER = 8; - private java.util.List resultItemList_; + public static final int UK10_FIELD_NUMBER = 13; + private java.util.List uk10_; /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ @java.lang.Override - public java.util.List getResultItemListList() { - return resultItemList_; + public java.util.List getUk10List() { + return uk10_; } /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ @java.lang.Override public java.util.List - getResultItemListOrBuilderList() { - return resultItemList_; + getUk10OrBuilderList() { + return uk10_; } /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ @java.lang.Override - public int getResultItemListCount() { - return resultItemList_.size(); + public int getUk10Count() { + return uk10_.size(); } /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) { - return resultItemList_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index) { + return uk10_.get(index); } /** - * repeated .ItemParam result_item_list = 8; + * 
+     * obf: ELNAMCCOIJL 解出来的可能不对
+     *
+ * + * repeated .ItemParam uk10 = 13; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( int index) { - return resultItemList_.get(index); + return uk10_.get(index); } - public static final int COST_ITEM_LIST_FIELD_NUMBER = 4; - private java.util.List costItemList_; + public static final int RESULT_ITEM_LIST_FIELD_NUMBER = 15; + private java.util.List resultItemList_; /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ @java.lang.Override - public java.util.List getCostItemListList() { - return costItemList_; + public java.util.List getResultItemListList() { + return resultItemList_; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ @java.lang.Override public java.util.List - getCostItemListOrBuilderList() { - return costItemList_; + getResultItemListOrBuilderList() { + return resultItemList_; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ @java.lang.Override - public int getCostItemListCount() { - return costItemList_.size(); + public int getResultItemListCount() { + return resultItemList_.size(); } /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index) { - return costItemList_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) { + return resultItemList_.get(index); } /** - * repeated .ItemParam cost_item_list = 4; + * 
+     * obf: IHGOLMOHHNJ 解出来的可能不对
+     *
+ * + * repeated .ItemParam result_item_list = 15; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( int index) { - return costItemList_.get(index); + return resultItemList_.get(index); } private byte memoizedIsInitialized = -1; @@ -665,35 +865,35 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (combineCount_ != 0) { - output.writeUInt32(3, combineCount_); + if (combineId_ != 0) { + output.writeUInt32(1, combineId_); } - for (int i = 0; i < costItemList_.size(); i++) { - output.writeMessage(4, costItemList_.get(i)); + for (int i = 0; i < totalExtraItemList_.size(); i++) { + output.writeMessage(3, totalExtraItemList_.get(i)); } - if (avatarGuid_ != 0L) { - output.writeUInt64(5, avatarGuid_); + for (int i = 0; i < totalReturnItemList_.size(); i++) { + output.writeMessage(4, totalReturnItemList_.get(i)); } - if (retcode_ != 0) { - output.writeInt32(6, retcode_); + if (combineCount_ != 0) { + output.writeUInt32(7, combineCount_); } - if (combineId_ != 0) { - output.writeUInt32(7, combineId_); + if (retcode_ != 0) { + output.writeInt32(8, retcode_); } - for (int i = 0; i < resultItemList_.size(); i++) { - output.writeMessage(8, resultItemList_.get(i)); + for (int i = 0; i < totalRandomItemList_.size(); i++) { + output.writeMessage(9, totalRandomItemList_.get(i)); } - for (int i = 0; i < uk10_.size(); i++) { - output.writeMessage(10, uk10_.get(i)); + for (int i = 0; i < costItemList_.size(); i++) { + output.writeMessage(10, costItemList_.get(i)); } - for (int i = 0; i < totalRandomItemList_.size(); i++) { - output.writeMessage(11, totalRandomItemList_.get(i)); + if (avatarGuid_ != 0L) { + output.writeUInt64(12, avatarGuid_); } - for (int i = 0; i < totalExtraItemList_.size(); i++) { - output.writeMessage(13, totalExtraItemList_.get(i)); + for (int i = 0; i < uk10_.size(); i++) { + output.writeMessage(13, uk10_.get(i)); } - for (int i = 0; i < totalReturnItemList_.size(); i++) { - output.writeMessage(15, totalReturnItemList_.get(i)); + for (int i = 0; i < resultItemList_.size(); i++) { + output.writeMessage(15, resultItemList_.get(i)); } unknownFields.writeTo(output); } @@ -704,45 +904,45 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (combineCount_ != 0) { + if (combineId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, combineCount_); + .computeUInt32Size(1, combineId_); } - for (int i = 0; i < costItemList_.size(); i++) { + for (int i = 0; i < totalExtraItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, costItemList_.get(i)); + .computeMessageSize(3, totalExtraItemList_.get(i)); } - if (avatarGuid_ != 0L) { + for (int i = 0; i < totalReturnItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(5, avatarGuid_); + .computeMessageSize(4, totalReturnItemList_.get(i)); } - if (retcode_ != 0) { + if (combineCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(6, retcode_); + .computeUInt32Size(7, combineCount_); } - if (combineId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, combineId_); + .computeInt32Size(8, retcode_); } - for (int i = 0; i < resultItemList_.size(); i++) { + for (int i = 0; i < totalRandomItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, resultItemList_.get(i)); + .computeMessageSize(9, totalRandomItemList_.get(i)); } - for (int i = 0; i < uk10_.size(); i++) { + for (int i = 0; i < costItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, uk10_.get(i)); + .computeMessageSize(10, costItemList_.get(i)); } - for (int i = 0; i < totalRandomItemList_.size(); i++) { + if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, totalRandomItemList_.get(i)); + .computeUInt64Size(12, avatarGuid_); } - for (int i = 0; i < totalExtraItemList_.size(); i++) { + for (int i = 0; i < uk10_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, totalExtraItemList_.get(i)); + .computeMessageSize(13, uk10_.get(i)); } - for (int i = 0; i < totalReturnItemList_.size(); i++) { + for (int i = 0; i < resultItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, totalReturnItemList_.get(i)); + .computeMessageSize(15, resultItemList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -761,24 +961,24 @@ public boolean equals(final java.lang.Object obj) { if (getCombineId() != other.getCombineId()) return false; - if (getCombineCount() - != other.getCombineCount()) return false; if (!getTotalExtraItemListList() .equals(other.getTotalExtraItemListList())) return false; if (!getTotalReturnItemListList() .equals(other.getTotalReturnItemListList())) return false; + if (getCombineCount() + != other.getCombineCount()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!getTotalRandomItemListList() .equals(other.getTotalRandomItemListList())) return false; - if (!getUk10List() - .equals(other.getUk10List())) return false; + if (!getCostItemListList() + .equals(other.getCostItemListList())) return false; if (getAvatarGuid() != other.getAvatarGuid()) return false; - if (getRetcode() - != other.getRetcode()) return false; + if (!getUk10List() + .equals(other.getUk10List())) return false; if (!getResultItemListList() .equals(other.getResultItemListList())) return false; - if (!getCostItemListList() - .equals(other.getCostItemListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -792,8 +992,6 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + COMBINE_ID_FIELD_NUMBER; hash = (53 * hash) + getCombineId(); - hash = (37 * hash) + COMBINE_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getCombineCount(); if (getTotalExtraItemListCount() > 0) { hash = (37 * hash) + TOTALEXTRAITEMLIST_FIELD_NUMBER; hash = (53 * hash) + getTotalExtraItemListList().hashCode(); @@ -802,27 +1000,29 @@ public int hashCode() { hash = (37 * hash) + TOTAL_RETURN_ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getTotalReturnItemListList().hashCode(); } + hash = (37 * hash) + COMBINE_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getCombineCount(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); if (getTotalRandomItemListCount() > 0) { hash = (37 * hash) + TOTALRANDOMITEMLIST_FIELD_NUMBER; hash = (53 * hash) + getTotalRandomItemListList().hashCode(); } - if (getUk10Count() > 0) { - hash = (37 * hash) + UK10_FIELD_NUMBER; - hash = (53 * hash) + getUk10List().hashCode(); + if (getCostItemListCount() > 0) { + hash = (37 * hash) + COST_ITEM_LIST_FIELD_NUMBER; + hash = (53 * hash) + getCostItemListList().hashCode(); } hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); + if (getUk10Count() > 0) { + hash = (37 * hash) + UK10_FIELD_NUMBER; + hash = (53 * hash) + getUk10List().hashCode(); + } if (getResultItemListCount() > 0) { hash = (37 * hash) + RESULT_ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getResultItemListList().hashCode(); } - if (getCostItemListCount() > 0) { - hash = (37 * hash) + COST_ITEM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getCostItemListList().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -920,8 +1120,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27346
-     * Obf: FPLEFMOIOGE
+     * CmdId: 29627
+     * obf: EIHMBDMBJGO
      *
* * Protobuf type {@code CombineRsp} @@ -959,9 +1159,9 @@ private void maybeForceBuilderInitialization() { getTotalExtraItemListFieldBuilder(); getTotalReturnItemListFieldBuilder(); getTotalRandomItemListFieldBuilder(); + getCostItemListFieldBuilder(); getUk10FieldBuilder(); getResultItemListFieldBuilder(); - getCostItemListFieldBuilder(); } } @java.lang.Override @@ -969,8 +1169,6 @@ public Builder clear() { super.clear(); combineId_ = 0; - combineCount_ = 0; - if (totalExtraItemListBuilder_ == null) { totalExtraItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); @@ -983,33 +1181,35 @@ public Builder clear() { } else { totalReturnItemListBuilder_.clear(); } + combineCount_ = 0; + + retcode_ = 0; + if (totalRandomItemListBuilder_ == null) { totalRandomItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000004); } else { totalRandomItemListBuilder_.clear(); } - if (uk10Builder_ == null) { - uk10_ = java.util.Collections.emptyList(); + if (costItemListBuilder_ == null) { + costItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000008); } else { - uk10Builder_.clear(); + costItemListBuilder_.clear(); } avatarGuid_ = 0L; - retcode_ = 0; - - if (resultItemListBuilder_ == null) { - resultItemList_ = java.util.Collections.emptyList(); + if (uk10Builder_ == null) { + uk10_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000010); } else { - resultItemListBuilder_.clear(); + uk10Builder_.clear(); } - if (costItemListBuilder_ == null) { - costItemList_ = java.util.Collections.emptyList(); + if (resultItemListBuilder_ == null) { + resultItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000020); } else { - costItemListBuilder_.clear(); + resultItemListBuilder_.clear(); } return this; } @@ -1039,7 +1239,6 @@ public emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp buildPartial() emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp result = new emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp(this); int from_bitField0_ = bitField0_; result.combineId_ = combineId_; - result.combineCount_ = combineCount_; if (totalExtraItemListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { totalExtraItemList_ = java.util.Collections.unmodifiableList(totalExtraItemList_); @@ -1058,6 +1257,8 @@ public emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp buildPartial() } else { result.totalReturnItemList_ = totalReturnItemListBuilder_.build(); } + result.combineCount_ = combineCount_; + result.retcode_ = retcode_; if (totalRandomItemListBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0)) { totalRandomItemList_ = java.util.Collections.unmodifiableList(totalRandomItemList_); @@ -1067,34 +1268,33 @@ public emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp buildPartial() } else { result.totalRandomItemList_ = totalRandomItemListBuilder_.build(); } - if (uk10Builder_ == null) { + if (costItemListBuilder_ == null) { if (((bitField0_ & 0x00000008) != 0)) { - uk10_ = java.util.Collections.unmodifiableList(uk10_); + costItemList_ = java.util.Collections.unmodifiableList(costItemList_); bitField0_ = (bitField0_ & ~0x00000008); } - result.uk10_ = uk10_; + result.costItemList_ = costItemList_; } else { - result.uk10_ = uk10Builder_.build(); + result.costItemList_ = costItemListBuilder_.build(); } result.avatarGuid_ = avatarGuid_; - result.retcode_ = retcode_; - if (resultItemListBuilder_ == null) { + if (uk10Builder_ == null) { if (((bitField0_ & 0x00000010) != 0)) { - resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_); + uk10_ = java.util.Collections.unmodifiableList(uk10_); bitField0_ = (bitField0_ & ~0x00000010); } - result.resultItemList_ = resultItemList_; + result.uk10_ = uk10_; } else { - result.resultItemList_ = resultItemListBuilder_.build(); + result.uk10_ = uk10Builder_.build(); } - if (costItemListBuilder_ == null) { + if (resultItemListBuilder_ == null) { if (((bitField0_ & 0x00000020) != 0)) { - costItemList_ = java.util.Collections.unmodifiableList(costItemList_); + resultItemList_ = java.util.Collections.unmodifiableList(resultItemList_); bitField0_ = (bitField0_ & ~0x00000020); } - result.costItemList_ = costItemList_; + result.resultItemList_ = resultItemList_; } else { - result.costItemList_ = costItemListBuilder_.build(); + result.resultItemList_ = resultItemListBuilder_.build(); } onBuilt(); return result; @@ -1147,9 +1347,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CombineRspOuterClass.CombineR if (other.getCombineId() != 0) { setCombineId(other.getCombineId()); } - if (other.getCombineCount() != 0) { - setCombineCount(other.getCombineCount()); - } if (totalExtraItemListBuilder_ == null) { if (!other.totalExtraItemList_.isEmpty()) { if (totalExtraItemList_.isEmpty()) { @@ -1202,6 +1399,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CombineRspOuterClass.CombineR } } } + if (other.getCombineCount() != 0) { + setCombineCount(other.getCombineCount()); + } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } if (totalRandomItemListBuilder_ == null) { if (!other.totalRandomItemList_.isEmpty()) { if (totalRandomItemList_.isEmpty()) { @@ -1228,11 +1431,40 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CombineRspOuterClass.CombineR } } } + if (costItemListBuilder_ == null) { + if (!other.costItemList_.isEmpty()) { + if (costItemList_.isEmpty()) { + costItemList_ = other.costItemList_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureCostItemListIsMutable(); + costItemList_.addAll(other.costItemList_); + } + onChanged(); + } + } else { + if (!other.costItemList_.isEmpty()) { + if (costItemListBuilder_.isEmpty()) { + costItemListBuilder_.dispose(); + costItemListBuilder_ = null; + costItemList_ = other.costItemList_; + bitField0_ = (bitField0_ & ~0x00000008); + costItemListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getCostItemListFieldBuilder() : null; + } else { + costItemListBuilder_.addAllMessages(other.costItemList_); + } + } + } + if (other.getAvatarGuid() != 0L) { + setAvatarGuid(other.getAvatarGuid()); + } if (uk10Builder_ == null) { if (!other.uk10_.isEmpty()) { if (uk10_.isEmpty()) { uk10_ = other.uk10_; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); } else { ensureUk10IsMutable(); uk10_.addAll(other.uk10_); @@ -1245,7 +1477,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CombineRspOuterClass.CombineR uk10Builder_.dispose(); uk10Builder_ = null; uk10_ = other.uk10_; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); uk10Builder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getUk10FieldBuilder() : null; @@ -1254,17 +1486,11 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CombineRspOuterClass.CombineR } } } - if (other.getAvatarGuid() != 0L) { - setAvatarGuid(other.getAvatarGuid()); - } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (resultItemListBuilder_ == null) { if (!other.resultItemList_.isEmpty()) { if (resultItemList_.isEmpty()) { resultItemList_ = other.resultItemList_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureResultItemListIsMutable(); resultItemList_.addAll(other.resultItemList_); @@ -1277,7 +1503,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CombineRspOuterClass.CombineR resultItemListBuilder_.dispose(); resultItemListBuilder_ = null; resultItemList_ = other.resultItemList_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); resultItemListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getResultItemListFieldBuilder() : null; @@ -1286,32 +1512,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CombineRspOuterClass.CombineR } } } - if (costItemListBuilder_ == null) { - if (!other.costItemList_.isEmpty()) { - if (costItemList_.isEmpty()) { - costItemList_ = other.costItemList_; - bitField0_ = (bitField0_ & ~0x00000020); - } else { - ensureCostItemListIsMutable(); - costItemList_.addAll(other.costItemList_); - } - onChanged(); - } - } else { - if (!other.costItemList_.isEmpty()) { - if (costItemListBuilder_.isEmpty()) { - costItemListBuilder_.dispose(); - costItemListBuilder_ = null; - costItemList_ = other.costItemList_; - bitField0_ = (bitField0_ & ~0x00000020); - costItemListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getCostItemListFieldBuilder() : null; - } else { - costItemListBuilder_.addAllMessages(other.costItemList_); - } - } - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1344,7 +1544,7 @@ public Builder mergeFrom( private int combineId_ ; /** - * uint32 combine_id = 7; + * uint32 combine_id = 1; * @return The combineId. */ @java.lang.Override @@ -1352,7 +1552,7 @@ public int getCombineId() { return combineId_; } /** - * uint32 combine_id = 7; + * uint32 combine_id = 1; * @param value The combineId to set. * @return This builder for chaining. */ @@ -1363,7 +1563,7 @@ public Builder setCombineId(int value) { return this; } /** - * uint32 combine_id = 7; + * uint32 combine_id = 1; * @return This builder for chaining. */ public Builder clearCombineId() { @@ -1373,37 +1573,6 @@ public Builder clearCombineId() { return this; } - private int combineCount_ ; - /** - * uint32 combine_count = 3; - * @return The combineCount. - */ - @java.lang.Override - public int getCombineCount() { - return combineCount_; - } - /** - * uint32 combine_count = 3; - * @param value The combineCount to set. - * @return This builder for chaining. - */ - public Builder setCombineCount(int value) { - - combineCount_ = value; - onChanged(); - return this; - } - /** - * uint32 combine_count = 3; - * @return This builder for chaining. - */ - public Builder clearCombineCount() { - - combineCount_ = 0; - onChanged(); - return this; - } - private java.util.List totalExtraItemList_ = java.util.Collections.emptyList(); private void ensureTotalExtraItemListIsMutable() { @@ -1417,7 +1586,11 @@ private void ensureTotalExtraItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> totalExtraItemListBuilder_; /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public java.util.List getTotalExtraItemListList() { if (totalExtraItemListBuilder_ == null) { @@ -1427,7 +1600,11 @@ public java.util.List g } } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public int getTotalExtraItemListCount() { if (totalExtraItemListBuilder_ == null) { @@ -1437,7 +1614,11 @@ public int getTotalExtraItemListCount() { } } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItemList(int index) { if (totalExtraItemListBuilder_ == null) { @@ -1447,7 +1628,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalExtraItem } } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder setTotalExtraItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1464,7 +1649,11 @@ public Builder setTotalExtraItemList( return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder setTotalExtraItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1478,7 +1667,11 @@ public Builder setTotalExtraItemList( return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder addTotalExtraItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (totalExtraItemListBuilder_ == null) { @@ -1494,7 +1687,11 @@ public Builder addTotalExtraItemList(emu.grasscutter.net.proto.ItemParamOuterCla return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder addTotalExtraItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1511,7 +1708,11 @@ public Builder addTotalExtraItemList( return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder addTotalExtraItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1525,7 +1726,11 @@ public Builder addTotalExtraItemList( return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder addTotalExtraItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1539,7 +1744,11 @@ public Builder addTotalExtraItemList( return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder addAllTotalExtraItemList( java.lang.Iterable values) { @@ -1554,7 +1763,11 @@ public Builder addAllTotalExtraItemList( return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder clearTotalExtraItemList() { if (totalExtraItemListBuilder_ == null) { @@ -1567,7 +1780,11 @@ public Builder clearTotalExtraItemList() { return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public Builder removeTotalExtraItemList(int index) { if (totalExtraItemListBuilder_ == null) { @@ -1580,14 +1797,22 @@ public Builder removeTotalExtraItemList(int index) { return this; } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalExtraItemListBuilder( int index) { return getTotalExtraItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalExtraItemListOrBuilder( int index) { @@ -1597,7 +1822,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal } } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public java.util.List getTotalExtraItemListOrBuilderList() { @@ -1608,14 +1837,22 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal } } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalExtraItemListBuilder() { return getTotalExtraItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalExtraItemListBuilder( int index) { @@ -1623,7 +1860,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalE index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam totalExtraItemList = 13; + * 
+       * obf: DIPIPCANMFM 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalExtraItemList = 3; */ public java.util.List getTotalExtraItemListBuilderList() { @@ -1657,7 +1898,11 @@ private void ensureTotalReturnItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> totalReturnItemListBuilder_; /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public java.util.List getTotalReturnItemListList() { if (totalReturnItemListBuilder_ == null) { @@ -1667,7 +1912,11 @@ public java.util.List g } } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public int getTotalReturnItemListCount() { if (totalReturnItemListBuilder_ == null) { @@ -1677,7 +1926,11 @@ public int getTotalReturnItemListCount() { } } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnItemList(int index) { if (totalReturnItemListBuilder_ == null) { @@ -1687,7 +1940,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalReturnIte } } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder setTotalReturnItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1704,7 +1961,11 @@ public Builder setTotalReturnItemList( return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder setTotalReturnItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1718,7 +1979,11 @@ public Builder setTotalReturnItemList( return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder addTotalReturnItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (totalReturnItemListBuilder_ == null) { @@ -1734,7 +1999,11 @@ public Builder addTotalReturnItemList(emu.grasscutter.net.proto.ItemParamOuterCl return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder addTotalReturnItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1751,7 +2020,11 @@ public Builder addTotalReturnItemList( return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder addTotalReturnItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1765,7 +2038,11 @@ public Builder addTotalReturnItemList( return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder addTotalReturnItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1779,7 +2056,11 @@ public Builder addTotalReturnItemList( return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder addAllTotalReturnItemList( java.lang.Iterable values) { @@ -1794,7 +2075,11 @@ public Builder addAllTotalReturnItemList( return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder clearTotalReturnItemList() { if (totalReturnItemListBuilder_ == null) { @@ -1807,7 +2092,11 @@ public Builder clearTotalReturnItemList() { return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public Builder removeTotalReturnItemList(int index) { if (totalReturnItemListBuilder_ == null) { @@ -1820,14 +2109,22 @@ public Builder removeTotalReturnItemList(int index) { return this; } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalReturnItemListBuilder( int index) { return getTotalReturnItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalReturnItemListOrBuilder( int index) { @@ -1837,7 +2134,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal } } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public java.util.List getTotalReturnItemListOrBuilderList() { @@ -1848,14 +2149,22 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal } } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalReturnItemListBuilder() { return getTotalReturnItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalReturnItemListBuilder( int index) { @@ -1863,7 +2172,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalR index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam total_return_item_list = 15; + * 
+       * obf: FNNHLPFGPIN 解出来的可能不对
+       *
+ * + * repeated .ItemParam total_return_item_list = 4; */ public java.util.List getTotalReturnItemListBuilderList() { @@ -1884,6 +2197,68 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalR return totalReturnItemListBuilder_; } + private int combineCount_ ; + /** + * uint32 combine_count = 7; + * @return The combineCount. + */ + @java.lang.Override + public int getCombineCount() { + return combineCount_; + } + /** + * uint32 combine_count = 7; + * @param value The combineCount to set. + * @return This builder for chaining. + */ + public Builder setCombineCount(int value) { + + combineCount_ = value; + onChanged(); + return this; + } + /** + * uint32 combine_count = 7; + * @return This builder for chaining. + */ + public Builder clearCombineCount() { + + combineCount_ = 0; + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 8; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 8; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 8; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + private java.util.List totalRandomItemList_ = java.util.Collections.emptyList(); private void ensureTotalRandomItemListIsMutable() { @@ -1897,7 +2272,11 @@ private void ensureTotalRandomItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> totalRandomItemListBuilder_; /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public java.util.List getTotalRandomItemListList() { if (totalRandomItemListBuilder_ == null) { @@ -1907,7 +2286,11 @@ public java.util.List g } } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public int getTotalRandomItemListCount() { if (totalRandomItemListBuilder_ == null) { @@ -1917,7 +2300,11 @@ public int getTotalRandomItemListCount() { } } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomItemList(int index) { if (totalRandomItemListBuilder_ == null) { @@ -1927,7 +2314,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTotalRandomIte } } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder setTotalRandomItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1944,7 +2335,11 @@ public Builder setTotalRandomItemList( return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder setTotalRandomItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1958,7 +2353,11 @@ public Builder setTotalRandomItemList( return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder addTotalRandomItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (totalRandomItemListBuilder_ == null) { @@ -1974,7 +2373,11 @@ public Builder addTotalRandomItemList(emu.grasscutter.net.proto.ItemParamOuterCl return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder addTotalRandomItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1991,7 +2394,11 @@ public Builder addTotalRandomItemList( return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder addTotalRandomItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -2005,7 +2412,11 @@ public Builder addTotalRandomItemList( return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder addTotalRandomItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -2019,7 +2430,11 @@ public Builder addTotalRandomItemList( return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder addAllTotalRandomItemList( java.lang.Iterable values) { @@ -2034,7 +2449,11 @@ public Builder addAllTotalRandomItemList( return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder clearTotalRandomItemList() { if (totalRandomItemListBuilder_ == null) { @@ -2047,7 +2466,11 @@ public Builder clearTotalRandomItemList() { return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public Builder removeTotalRandomItemList(int index) { if (totalRandomItemListBuilder_ == null) { @@ -2060,14 +2483,22 @@ public Builder removeTotalRandomItemList(int index) { return this; } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTotalRandomItemListBuilder( int index) { return getTotalRandomItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotalRandomItemListOrBuilder( int index) { @@ -2077,7 +2508,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal } } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public java.util.List getTotalRandomItemListOrBuilderList() { @@ -2088,14 +2523,22 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTotal } } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalRandomItemListBuilder() { return getTotalRandomItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalRandomItemListBuilder( int index) { @@ -2103,7 +2546,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalR index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam totalRandomItemList = 11; + * 
+       * obf: LLOJHCEIBGO 解出来的可能不对
+       *
+ * + * repeated .ItemParam totalRandomItemList = 9; */ public java.util.List getTotalRandomItemListBuilderList() { @@ -2124,249 +2571,249 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTotalR return totalRandomItemListBuilder_; } - private java.util.List uk10_ = + private java.util.List costItemList_ = java.util.Collections.emptyList(); - private void ensureUk10IsMutable() { + private void ensureCostItemListIsMutable() { if (!((bitField0_ & 0x00000008) != 0)) { - uk10_ = new java.util.ArrayList(uk10_); + costItemList_ = new java.util.ArrayList(costItemList_); bitField0_ |= 0x00000008; } } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> uk10Builder_; + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> costItemListBuilder_; /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public java.util.List getUk10List() { - if (uk10Builder_ == null) { - return java.util.Collections.unmodifiableList(uk10_); + public java.util.List getCostItemListList() { + if (costItemListBuilder_ == null) { + return java.util.Collections.unmodifiableList(costItemList_); } else { - return uk10Builder_.getMessageList(); + return costItemListBuilder_.getMessageList(); } } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public int getUk10Count() { - if (uk10Builder_ == null) { - return uk10_.size(); + public int getCostItemListCount() { + if (costItemListBuilder_ == null) { + return costItemList_.size(); } else { - return uk10Builder_.getCount(); + return costItemListBuilder_.getCount(); } } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index) { - if (uk10Builder_ == null) { - return uk10_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index) { + if (costItemListBuilder_ == null) { + return costItemList_.get(index); } else { - return uk10Builder_.getMessage(index); + return costItemListBuilder_.getMessage(index); } } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder setUk10( + public Builder setCostItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (uk10Builder_ == null) { + if (costItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureUk10IsMutable(); - uk10_.set(index, value); + ensureCostItemListIsMutable(); + costItemList_.set(index, value); onChanged(); } else { - uk10Builder_.setMessage(index, value); + costItemListBuilder_.setMessage(index, value); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder setUk10( + public Builder setCostItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (uk10Builder_ == null) { - ensureUk10IsMutable(); - uk10_.set(index, builderForValue.build()); + if (costItemListBuilder_ == null) { + ensureCostItemListIsMutable(); + costItemList_.set(index, builderForValue.build()); onChanged(); } else { - uk10Builder_.setMessage(index, builderForValue.build()); + costItemListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder addUk10(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (uk10Builder_ == null) { + public Builder addCostItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (costItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureUk10IsMutable(); - uk10_.add(value); + ensureCostItemListIsMutable(); + costItemList_.add(value); onChanged(); } else { - uk10Builder_.addMessage(value); + costItemListBuilder_.addMessage(value); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder addUk10( + public Builder addCostItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (uk10Builder_ == null) { + if (costItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureUk10IsMutable(); - uk10_.add(index, value); + ensureCostItemListIsMutable(); + costItemList_.add(index, value); onChanged(); } else { - uk10Builder_.addMessage(index, value); + costItemListBuilder_.addMessage(index, value); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder addUk10( + public Builder addCostItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (uk10Builder_ == null) { - ensureUk10IsMutable(); - uk10_.add(builderForValue.build()); + if (costItemListBuilder_ == null) { + ensureCostItemListIsMutable(); + costItemList_.add(builderForValue.build()); onChanged(); } else { - uk10Builder_.addMessage(builderForValue.build()); + costItemListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder addUk10( + public Builder addCostItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (uk10Builder_ == null) { - ensureUk10IsMutable(); - uk10_.add(index, builderForValue.build()); + if (costItemListBuilder_ == null) { + ensureCostItemListIsMutable(); + costItemList_.add(index, builderForValue.build()); onChanged(); } else { - uk10Builder_.addMessage(index, builderForValue.build()); + costItemListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder addAllUk10( + public Builder addAllCostItemList( java.lang.Iterable values) { - if (uk10Builder_ == null) { - ensureUk10IsMutable(); + if (costItemListBuilder_ == null) { + ensureCostItemListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, uk10_); + values, costItemList_); onChanged(); } else { - uk10Builder_.addAllMessages(values); + costItemListBuilder_.addAllMessages(values); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder clearUk10() { - if (uk10Builder_ == null) { - uk10_ = java.util.Collections.emptyList(); + public Builder clearCostItemList() { + if (costItemListBuilder_ == null) { + costItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { - uk10Builder_.clear(); + costItemListBuilder_.clear(); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public Builder removeUk10(int index) { - if (uk10Builder_ == null) { - ensureUk10IsMutable(); - uk10_.remove(index); + public Builder removeCostItemList(int index) { + if (costItemListBuilder_ == null) { + ensureCostItemListIsMutable(); + costItemList_.remove(index); onChanged(); } else { - uk10Builder_.remove(index); + costItemListBuilder_.remove(index); } return this; } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getUk10Builder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getCostItemListBuilder( int index) { - return getUk10FieldBuilder().getBuilder(index); + return getCostItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder( int index) { - if (uk10Builder_ == null) { - return uk10_.get(index); } else { - return uk10Builder_.getMessageOrBuilder(index); + if (costItemListBuilder_ == null) { + return costItemList_.get(index); } else { + return costItemListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ public java.util.List - getUk10OrBuilderList() { - if (uk10Builder_ != null) { - return uk10Builder_.getMessageOrBuilderList(); + getCostItemListOrBuilderList() { + if (costItemListBuilder_ != null) { + return costItemListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(uk10_); + return java.util.Collections.unmodifiableList(costItemList_); } } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addUk10Builder() { - return getUk10FieldBuilder().addBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addCostItemListBuilder() { + return getCostItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addUk10Builder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addCostItemListBuilder( int index) { - return getUk10FieldBuilder().addBuilder( + return getCostItemListFieldBuilder().addBuilder( index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam uk10 = 10; + * repeated .ItemParam cost_item_list = 10; */ public java.util.List - getUk10BuilderList() { - return getUk10FieldBuilder().getBuilderList(); + getCostItemListBuilderList() { + return getCostItemListFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> - getUk10FieldBuilder() { - if (uk10Builder_ == null) { - uk10Builder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + getCostItemListFieldBuilder() { + if (costItemListBuilder_ == null) { + costItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( - uk10_, + costItemList_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); - uk10_ = null; + costItemList_ = null; } - return uk10Builder_; + return costItemListBuilder_; } private long avatarGuid_ ; /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 12; * @return The avatarGuid. */ @java.lang.Override @@ -2374,7 +2821,7 @@ public long getAvatarGuid() { return avatarGuid_; } /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 12; * @param value The avatarGuid to set. * @return This builder for chaining. */ @@ -2385,7 +2832,7 @@ public Builder setAvatarGuid(long value) { return this; } /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 12; * @return This builder for chaining. */ public Builder clearAvatarGuid() { @@ -2395,515 +2842,628 @@ public Builder clearAvatarGuid() { return this; } - private int retcode_ ; - /** - * int32 retcode = 6; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 6; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 6; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - - private java.util.List resultItemList_ = + private java.util.List uk10_ = java.util.Collections.emptyList(); - private void ensureResultItemListIsMutable() { + private void ensureUk10IsMutable() { if (!((bitField0_ & 0x00000010) != 0)) { - resultItemList_ = new java.util.ArrayList(resultItemList_); + uk10_ = new java.util.ArrayList(uk10_); bitField0_ |= 0x00000010; } } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> resultItemListBuilder_; + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> uk10Builder_; /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public java.util.List getResultItemListList() { - if (resultItemListBuilder_ == null) { - return java.util.Collections.unmodifiableList(resultItemList_); + public java.util.List getUk10List() { + if (uk10Builder_ == null) { + return java.util.Collections.unmodifiableList(uk10_); } else { - return resultItemListBuilder_.getMessageList(); + return uk10Builder_.getMessageList(); } } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public int getResultItemListCount() { - if (resultItemListBuilder_ == null) { - return resultItemList_.size(); + public int getUk10Count() { + if (uk10Builder_ == null) { + return uk10_.size(); } else { - return resultItemListBuilder_.getCount(); + return uk10Builder_.getCount(); } } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) { - if (resultItemListBuilder_ == null) { - return resultItemList_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getUk10(int index) { + if (uk10Builder_ == null) { + return uk10_.get(index); } else { - return resultItemListBuilder_.getMessage(index); + return uk10Builder_.getMessage(index); } } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder setResultItemList( + public Builder setUk10( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (resultItemListBuilder_ == null) { + if (uk10Builder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureResultItemListIsMutable(); - resultItemList_.set(index, value); + ensureUk10IsMutable(); + uk10_.set(index, value); onChanged(); } else { - resultItemListBuilder_.setMessage(index, value); + uk10Builder_.setMessage(index, value); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder setResultItemList( + public Builder setUk10( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - resultItemList_.set(index, builderForValue.build()); + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + uk10_.set(index, builderForValue.build()); onChanged(); } else { - resultItemListBuilder_.setMessage(index, builderForValue.build()); + uk10Builder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder addResultItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (resultItemListBuilder_ == null) { + public Builder addUk10(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (uk10Builder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureResultItemListIsMutable(); - resultItemList_.add(value); + ensureUk10IsMutable(); + uk10_.add(value); onChanged(); } else { - resultItemListBuilder_.addMessage(value); + uk10Builder_.addMessage(value); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder addResultItemList( + public Builder addUk10( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (resultItemListBuilder_ == null) { + if (uk10Builder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureResultItemListIsMutable(); - resultItemList_.add(index, value); + ensureUk10IsMutable(); + uk10_.add(index, value); onChanged(); } else { - resultItemListBuilder_.addMessage(index, value); + uk10Builder_.addMessage(index, value); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder addResultItemList( + public Builder addUk10( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - resultItemList_.add(builderForValue.build()); + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + uk10_.add(builderForValue.build()); onChanged(); } else { - resultItemListBuilder_.addMessage(builderForValue.build()); + uk10Builder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder addResultItemList( + public Builder addUk10( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - resultItemList_.add(index, builderForValue.build()); + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + uk10_.add(index, builderForValue.build()); onChanged(); } else { - resultItemListBuilder_.addMessage(index, builderForValue.build()); + uk10Builder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder addAllResultItemList( + public Builder addAllUk10( java.lang.Iterable values) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); + if (uk10Builder_ == null) { + ensureUk10IsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, resultItemList_); + values, uk10_); onChanged(); } else { - resultItemListBuilder_.addAllMessages(values); + uk10Builder_.addAllMessages(values); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder clearResultItemList() { - if (resultItemListBuilder_ == null) { - resultItemList_ = java.util.Collections.emptyList(); + public Builder clearUk10() { + if (uk10Builder_ == null) { + uk10_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000010); onChanged(); } else { - resultItemListBuilder_.clear(); + uk10Builder_.clear(); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public Builder removeResultItemList(int index) { - if (resultItemListBuilder_ == null) { - ensureResultItemListIsMutable(); - resultItemList_.remove(index); + public Builder removeUk10(int index) { + if (uk10Builder_ == null) { + ensureUk10IsMutable(); + uk10_.remove(index); onChanged(); } else { - resultItemListBuilder_.remove(index); + uk10Builder_.remove(index); } return this; } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getResultItemListBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getUk10Builder( int index) { - return getResultItemListFieldBuilder().getBuilder(index); + return getUk10FieldBuilder().getBuilder(index); } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getUk10OrBuilder( int index) { - if (resultItemListBuilder_ == null) { - return resultItemList_.get(index); } else { - return resultItemListBuilder_.getMessageOrBuilder(index); + if (uk10Builder_ == null) { + return uk10_.get(index); } else { + return uk10Builder_.getMessageOrBuilder(index); } } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ public java.util.List - getResultItemListOrBuilderList() { - if (resultItemListBuilder_ != null) { - return resultItemListBuilder_.getMessageOrBuilderList(); + getUk10OrBuilderList() { + if (uk10Builder_ != null) { + return uk10Builder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(resultItemList_); + return java.util.Collections.unmodifiableList(uk10_); } } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder() { - return getResultItemListFieldBuilder().addBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addUk10Builder() { + return getUk10FieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addUk10Builder( int index) { - return getResultItemListFieldBuilder().addBuilder( + return getUk10FieldBuilder().addBuilder( index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam result_item_list = 8; + * 
+       * obf: ELNAMCCOIJL 解出来的可能不对
+       *
+ * + * repeated .ItemParam uk10 = 13; */ public java.util.List - getResultItemListBuilderList() { - return getResultItemListFieldBuilder().getBuilderList(); + getUk10BuilderList() { + return getUk10FieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> - getResultItemListFieldBuilder() { - if (resultItemListBuilder_ == null) { - resultItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + getUk10FieldBuilder() { + if (uk10Builder_ == null) { + uk10Builder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( - resultItemList_, + uk10_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); - resultItemList_ = null; + uk10_ = null; } - return resultItemListBuilder_; + return uk10Builder_; } - private java.util.List costItemList_ = + private java.util.List resultItemList_ = java.util.Collections.emptyList(); - private void ensureCostItemListIsMutable() { + private void ensureResultItemListIsMutable() { if (!((bitField0_ & 0x00000020) != 0)) { - costItemList_ = new java.util.ArrayList(costItemList_); + resultItemList_ = new java.util.ArrayList(resultItemList_); bitField0_ |= 0x00000020; } } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> costItemListBuilder_; + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> resultItemListBuilder_; /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public java.util.List getCostItemListList() { - if (costItemListBuilder_ == null) { - return java.util.Collections.unmodifiableList(costItemList_); + public java.util.List getResultItemListList() { + if (resultItemListBuilder_ == null) { + return java.util.Collections.unmodifiableList(resultItemList_); } else { - return costItemListBuilder_.getMessageList(); + return resultItemListBuilder_.getMessageList(); } } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public int getCostItemListCount() { - if (costItemListBuilder_ == null) { - return costItemList_.size(); + public int getResultItemListCount() { + if (resultItemListBuilder_ == null) { + return resultItemList_.size(); } else { - return costItemListBuilder_.getCount(); + return resultItemListBuilder_.getCount(); } } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index) { - if (costItemListBuilder_ == null) { - return costItemList_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getResultItemList(int index) { + if (resultItemListBuilder_ == null) { + return resultItemList_.get(index); } else { - return costItemListBuilder_.getMessage(index); + return resultItemListBuilder_.getMessage(index); } } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder setCostItemList( + public Builder setResultItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (costItemListBuilder_ == null) { + if (resultItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureCostItemListIsMutable(); - costItemList_.set(index, value); + ensureResultItemListIsMutable(); + resultItemList_.set(index, value); onChanged(); } else { - costItemListBuilder_.setMessage(index, value); + resultItemListBuilder_.setMessage(index, value); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder setCostItemList( + public Builder setResultItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (costItemListBuilder_ == null) { - ensureCostItemListIsMutable(); - costItemList_.set(index, builderForValue.build()); + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); + resultItemList_.set(index, builderForValue.build()); onChanged(); } else { - costItemListBuilder_.setMessage(index, builderForValue.build()); + resultItemListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder addCostItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (costItemListBuilder_ == null) { + public Builder addResultItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (resultItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureCostItemListIsMutable(); - costItemList_.add(value); + ensureResultItemListIsMutable(); + resultItemList_.add(value); onChanged(); } else { - costItemListBuilder_.addMessage(value); + resultItemListBuilder_.addMessage(value); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder addCostItemList( + public Builder addResultItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (costItemListBuilder_ == null) { + if (resultItemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureCostItemListIsMutable(); - costItemList_.add(index, value); + ensureResultItemListIsMutable(); + resultItemList_.add(index, value); onChanged(); } else { - costItemListBuilder_.addMessage(index, value); + resultItemListBuilder_.addMessage(index, value); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder addCostItemList( + public Builder addResultItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (costItemListBuilder_ == null) { - ensureCostItemListIsMutable(); - costItemList_.add(builderForValue.build()); + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); + resultItemList_.add(builderForValue.build()); onChanged(); } else { - costItemListBuilder_.addMessage(builderForValue.build()); + resultItemListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder addCostItemList( + public Builder addResultItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (costItemListBuilder_ == null) { - ensureCostItemListIsMutable(); - costItemList_.add(index, builderForValue.build()); + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); + resultItemList_.add(index, builderForValue.build()); onChanged(); } else { - costItemListBuilder_.addMessage(index, builderForValue.build()); + resultItemListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder addAllCostItemList( + public Builder addAllResultItemList( java.lang.Iterable values) { - if (costItemListBuilder_ == null) { - ensureCostItemListIsMutable(); + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, costItemList_); + values, resultItemList_); onChanged(); } else { - costItemListBuilder_.addAllMessages(values); + resultItemListBuilder_.addAllMessages(values); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder clearCostItemList() { - if (costItemListBuilder_ == null) { - costItemList_ = java.util.Collections.emptyList(); + public Builder clearResultItemList() { + if (resultItemListBuilder_ == null) { + resultItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000020); onChanged(); } else { - costItemListBuilder_.clear(); + resultItemListBuilder_.clear(); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public Builder removeCostItemList(int index) { - if (costItemListBuilder_ == null) { - ensureCostItemListIsMutable(); - costItemList_.remove(index); + public Builder removeResultItemList(int index) { + if (resultItemListBuilder_ == null) { + ensureResultItemListIsMutable(); + resultItemList_.remove(index); onChanged(); } else { - costItemListBuilder_.remove(index); + resultItemListBuilder_.remove(index); } return this; } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getCostItemListBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getResultItemListBuilder( int index) { - return getCostItemListFieldBuilder().getBuilder(index); + return getResultItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getResultItemListOrBuilder( int index) { - if (costItemListBuilder_ == null) { - return costItemList_.get(index); } else { - return costItemListBuilder_.getMessageOrBuilder(index); + if (resultItemListBuilder_ == null) { + return resultItemList_.get(index); } else { + return resultItemListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ public java.util.List - getCostItemListOrBuilderList() { - if (costItemListBuilder_ != null) { - return costItemListBuilder_.getMessageOrBuilderList(); + getResultItemListOrBuilderList() { + if (resultItemListBuilder_ != null) { + return resultItemListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(costItemList_); + return java.util.Collections.unmodifiableList(resultItemList_); } } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addCostItemListBuilder() { - return getCostItemListFieldBuilder().addBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder() { + return getResultItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addCostItemListBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addResultItemListBuilder( int index) { - return getCostItemListFieldBuilder().addBuilder( + return getResultItemListFieldBuilder().addBuilder( index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam cost_item_list = 4; + * 
+       * obf: IHGOLMOHHNJ 解出来的可能不对
+       *
+ * + * repeated .ItemParam result_item_list = 15; */ public java.util.List - getCostItemListBuilderList() { - return getCostItemListFieldBuilder().getBuilderList(); + getResultItemListBuilderList() { + return getResultItemListFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> - getCostItemListFieldBuilder() { - if (costItemListBuilder_ == null) { - costItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + getResultItemListFieldBuilder() { + if (resultItemListBuilder_ == null) { + resultItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( - costItemList_, + resultItemList_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); - costItemList_ = null; + resultItemList_ = null; } - return costItemListBuilder_; + return resultItemListBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -2973,14 +3533,14 @@ public emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp getDefaultInsta static { java.lang.String[] descriptorData = { "\n\020CombineRsp.proto\032\017ItemParam.proto\"\276\002\n\n" + - "CombineRsp\022\022\n\ncombine_id\030\007 \001(\r\022\025\n\rcombin" + - "e_count\030\003 \001(\r\022&\n\022totalExtraItemList\030\r \003(" + - "\0132\n.ItemParam\022*\n\026total_return_item_list\030" + - "\017 \003(\0132\n.ItemParam\022\'\n\023totalRandomItemList" + - "\030\013 \003(\0132\n.ItemParam\022\030\n\004uk10\030\n \003(\0132\n.ItemP" + - "aram\022\023\n\013avatar_guid\030\005 \001(\004\022\017\n\007retcode\030\006 \001" + - "(\005\022$\n\020result_item_list\030\010 \003(\0132\n.ItemParam" + - "\022\"\n\016cost_item_list\030\004 \003(\0132\n.ItemParamB\033\n\031" + + "CombineRsp\022\022\n\ncombine_id\030\001 \001(\r\022&\n\022totalE" + + "xtraItemList\030\003 \003(\0132\n.ItemParam\022*\n\026total_" + + "return_item_list\030\004 \003(\0132\n.ItemParam\022\025\n\rco" + + "mbine_count\030\007 \001(\r\022\017\n\007retcode\030\010 \001(\005\022\'\n\023to" + + "talRandomItemList\030\t \003(\0132\n.ItemParam\022\"\n\016c" + + "ost_item_list\030\n \003(\0132\n.ItemParam\022\023\n\013avata" + + "r_guid\030\014 \001(\004\022\030\n\004uk10\030\r \003(\0132\n.ItemParam\022$" + + "\n\020result_item_list\030\017 \003(\0132\n.ItemParamB\033\n\031" + "emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -2993,7 +3553,7 @@ public emu.grasscutter.net.proto.CombineRspOuterClass.CombineRsp getDefaultInsta internal_static_CombineRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CombineRsp_descriptor, - new java.lang.String[] { "CombineId", "CombineCount", "TotalExtraItemList", "TotalReturnItemList", "TotalRandomItemList", "Uk10", "AvatarGuid", "Retcode", "ResultItemList", "CostItemList", }); + new java.lang.String[] { "CombineId", "TotalExtraItemList", "TotalReturnItemList", "CombineCount", "Retcode", "TotalRandomItemList", "CostItemList", "AvatarGuid", "Uk10", "ResultItemList", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CompoundDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CompoundDataNotifyOuterClass.java index 5c87d44df40..ff309fef41e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CompoundDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CompoundDataNotifyOuterClass.java @@ -19,41 +19,41 @@ public interface CompoundDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ java.util.List getCompoundQueueDataListList(); /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueDataList(int index); /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ int getCompoundQueueDataListCount(); /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ java.util.List getCompoundQueueDataListOrBuilderList(); /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataListOrBuilder( int index); /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @return A list containing the unlockCompoundList. */ java.util.List getUnlockCompoundListList(); /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @return The count of unlockCompoundList. */ int getUnlockCompoundListCount(); /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @param index The index of the element to return. * @return The unlockCompoundList at the given index. */ @@ -61,8 +61,8 @@ emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder } /** * 
-   * CmdId: 25801
-   * Obf: MMAMJJIHNBP
+   * CmdId: 5964
+   * obf: PGMJBAMAOND
    *
* * Protobuf type {@code CompoundDataNotify} @@ -112,7 +112,16 @@ private CompoundDataNotify( case 0: done = true; break; - case 48: { + case 50: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + compoundQueueDataList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + compoundQueueDataList_.add( + input.readMessage(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.parser(), extensionRegistry)); + break; + } + case 72: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { unlockCompoundList_ = newIntList(); mutable_bitField0_ |= 0x00000002; @@ -120,7 +129,7 @@ private CompoundDataNotify( unlockCompoundList_.addInt(input.readUInt32()); break; } - case 50: { + case 74: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { @@ -133,15 +142,6 @@ private CompoundDataNotify( input.popLimit(limit); break; } - case 74: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - compoundQueueDataList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - compoundQueueDataList_.add( - input.readMessage(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.parser(), extensionRegistry)); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -157,12 +157,12 @@ private CompoundDataNotify( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - unlockCompoundList_.makeImmutable(); // C - } if (((mutable_bitField0_ & 0x00000001) != 0)) { compoundQueueDataList_ = java.util.Collections.unmodifiableList(compoundQueueDataList_); } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + unlockCompoundList_.makeImmutable(); // C + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -180,17 +180,17 @@ private CompoundDataNotify( emu.grasscutter.net.proto.CompoundDataNotifyOuterClass.CompoundDataNotify.class, emu.grasscutter.net.proto.CompoundDataNotifyOuterClass.CompoundDataNotify.Builder.class); } - public static final int COMPOUNDQUEUEDATALIST_FIELD_NUMBER = 9; + public static final int COMPOUNDQUEUEDATALIST_FIELD_NUMBER = 6; private java.util.List compoundQueueDataList_; /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ @java.lang.Override public java.util.List getCompoundQueueDataListList() { return compoundQueueDataList_; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ @java.lang.Override public java.util.List @@ -198,21 +198,21 @@ public java.util.Listrepeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ @java.lang.Override public int getCompoundQueueDataListCount() { return compoundQueueDataList_.size(); } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ @java.lang.Override public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueDataList(int index) { return compoundQueueDataList_.get(index); } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ @java.lang.Override public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataListOrBuilder( @@ -220,10 +220,10 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOr return compoundQueueDataList_.get(index); } - public static final int UNLOCKCOMPOUNDLIST_FIELD_NUMBER = 6; + public static final int UNLOCKCOMPOUNDLIST_FIELD_NUMBER = 9; private com.google.protobuf.Internal.IntList unlockCompoundList_; /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @return A list containing the unlockCompoundList. */ @java.lang.Override @@ -232,14 +232,14 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOr return unlockCompoundList_; } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @return The count of unlockCompoundList. */ public int getUnlockCompoundListCount() { return unlockCompoundList_.size(); } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @param index The index of the element to return. * @return The unlockCompoundList at the given index. */ @@ -263,16 +263,16 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); + for (int i = 0; i < compoundQueueDataList_.size(); i++) { + output.writeMessage(6, compoundQueueDataList_.get(i)); + } if (getUnlockCompoundListList().size() > 0) { - output.writeUInt32NoTag(50); + output.writeUInt32NoTag(74); output.writeUInt32NoTag(unlockCompoundListMemoizedSerializedSize); } for (int i = 0; i < unlockCompoundList_.size(); i++) { output.writeUInt32NoTag(unlockCompoundList_.getInt(i)); } - for (int i = 0; i < compoundQueueDataList_.size(); i++) { - output.writeMessage(9, compoundQueueDataList_.get(i)); - } unknownFields.writeTo(output); } @@ -282,6 +282,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + for (int i = 0; i < compoundQueueDataList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, compoundQueueDataList_.get(i)); + } { int dataSize = 0; for (int i = 0; i < unlockCompoundList_.size(); i++) { @@ -296,10 +300,6 @@ public int getSerializedSize() { } unlockCompoundListMemoizedSerializedSize = dataSize; } - for (int i = 0; i < compoundQueueDataList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, compoundQueueDataList_.get(i)); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -435,8 +435,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25801
-     * Obf: MMAMJJIHNBP
+     * CmdId: 5964
+     * obf: PGMJBAMAOND
      *
* * Protobuf type {@code CompoundDataNotify} @@ -653,7 +653,7 @@ private void ensureCompoundQueueDataListIsMutable() { emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder> compoundQueueDataListBuilder_; /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public java.util.List getCompoundQueueDataListList() { if (compoundQueueDataListBuilder_ == null) { @@ -663,7 +663,7 @@ public java.util.Listrepeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public int getCompoundQueueDataListCount() { if (compoundQueueDataListBuilder_ == null) { @@ -673,7 +673,7 @@ public int getCompoundQueueDataListCount() { } } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueDataList(int index) { if (compoundQueueDataListBuilder_ == null) { @@ -683,7 +683,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData g } } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder setCompoundQueueDataList( int index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) { @@ -700,7 +700,7 @@ public Builder setCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder setCompoundQueueDataList( int index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) { @@ -714,7 +714,7 @@ public Builder setCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder addCompoundQueueDataList(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) { if (compoundQueueDataListBuilder_ == null) { @@ -730,7 +730,7 @@ public Builder addCompoundQueueDataList(emu.grasscutter.net.proto.CompoundQueueD return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder addCompoundQueueDataList( int index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) { @@ -747,7 +747,7 @@ public Builder addCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder addCompoundQueueDataList( emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) { @@ -761,7 +761,7 @@ public Builder addCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder addCompoundQueueDataList( int index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) { @@ -775,7 +775,7 @@ public Builder addCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder addAllCompoundQueueDataList( java.lang.Iterable values) { @@ -790,7 +790,7 @@ public Builder addAllCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder clearCompoundQueueDataList() { if (compoundQueueDataListBuilder_ == null) { @@ -803,7 +803,7 @@ public Builder clearCompoundQueueDataList() { return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public Builder removeCompoundQueueDataList(int index) { if (compoundQueueDataListBuilder_ == null) { @@ -816,14 +816,14 @@ public Builder removeCompoundQueueDataList(int index) { return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder getCompoundQueueDataListBuilder( int index) { return getCompoundQueueDataListFieldBuilder().getBuilder(index); } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataListOrBuilder( int index) { @@ -833,7 +833,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOr } } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public java.util.List getCompoundQueueDataListOrBuilderList() { @@ -844,14 +844,14 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOr } } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder addCompoundQueueDataListBuilder() { return getCompoundQueueDataListFieldBuilder().addBuilder( emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance()); } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder addCompoundQueueDataListBuilder( int index) { @@ -859,7 +859,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.B index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance()); } /** - * repeated .CompoundQueueData compoundQueueDataList = 9; + * repeated .CompoundQueueData compoundQueueDataList = 6; */ public java.util.List getCompoundQueueDataListBuilderList() { @@ -888,7 +888,7 @@ private void ensureUnlockCompoundListIsMutable() { } } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @return A list containing the unlockCompoundList. */ public java.util.List @@ -897,14 +897,14 @@ private void ensureUnlockCompoundListIsMutable() { java.util.Collections.unmodifiableList(unlockCompoundList_) : unlockCompoundList_; } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @return The count of unlockCompoundList. */ public int getUnlockCompoundListCount() { return unlockCompoundList_.size(); } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @param index The index of the element to return. * @return The unlockCompoundList at the given index. */ @@ -912,7 +912,7 @@ public int getUnlockCompoundList(int index) { return unlockCompoundList_.getInt(index); } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @param index The index to set the value at. * @param value The unlockCompoundList to set. * @return This builder for chaining. @@ -925,7 +925,7 @@ public Builder setUnlockCompoundList( return this; } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @param value The unlockCompoundList to add. * @return This builder for chaining. */ @@ -936,7 +936,7 @@ public Builder addUnlockCompoundList(int value) { return this; } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @param values The unlockCompoundList to add. * @return This builder for chaining. */ @@ -949,7 +949,7 @@ public Builder addAllUnlockCompoundList( return this; } /** - * repeated uint32 unlockCompoundList = 6; + * repeated uint32 unlockCompoundList = 9; * @return This builder for chaining. */ public Builder clearUnlockCompoundList() { @@ -1027,8 +1027,8 @@ public emu.grasscutter.net.proto.CompoundDataNotifyOuterClass.CompoundDataNotify java.lang.String[] descriptorData = { "\n\030CompoundDataNotify.proto\032\027CompoundQueu" + "eData.proto\"c\n\022CompoundDataNotify\0221\n\025com" + - "poundQueueDataList\030\t \003(\0132\022.CompoundQueue" + - "Data\022\032\n\022unlockCompoundList\030\006 \003(\rB\033\n\031emu." + + "poundQueueDataList\030\006 \003(\0132\022.CompoundQueue" + + "Data\022\032\n\022unlockCompoundList\030\t \003(\rB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CompoundQueueDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CompoundQueueDataOuterClass.java index c5060a6c4b5..19235780883 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CompoundQueueDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CompoundQueueDataOuterClass.java @@ -25,7 +25,7 @@ public interface CompoundQueueDataOrBuilder extends int getOutputTime(); /** - * uint32 waitCount = 14; + * uint32 waitCount = 6; * @return The waitCount. */ int getWaitCount(); @@ -44,7 +44,7 @@ public interface CompoundQueueDataOrBuilder extends } /** * 
-   * Obf: EEHJDMLBLEE
+   * obf: AHHMJALNJOH
    *
* * Protobuf type {@code CompoundQueueData} @@ -96,6 +96,11 @@ private CompoundQueueData( outputTime_ = input.readUInt32(); break; } + case 48: { + + waitCount_ = input.readUInt32(); + break; + } case 88: { compoundId_ = input.readUInt32(); @@ -106,11 +111,6 @@ private CompoundQueueData( outputCount_ = input.readUInt32(); break; } - case 112: { - - waitCount_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -154,10 +154,10 @@ public int getOutputTime() { return outputTime_; } - public static final int WAITCOUNT_FIELD_NUMBER = 14; + public static final int WAITCOUNT_FIELD_NUMBER = 6; private int waitCount_; /** - * uint32 waitCount = 14; + * uint32 waitCount = 6; * @return The waitCount. */ @java.lang.Override @@ -204,15 +204,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (outputTime_ != 0) { output.writeUInt32(1, outputTime_); } + if (waitCount_ != 0) { + output.writeUInt32(6, waitCount_); + } if (compoundId_ != 0) { output.writeUInt32(11, compoundId_); } if (outputCount_ != 0) { output.writeUInt32(12, outputCount_); } - if (waitCount_ != 0) { - output.writeUInt32(14, waitCount_); - } unknownFields.writeTo(output); } @@ -226,6 +226,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(1, outputTime_); } + if (waitCount_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(6, waitCount_); + } if (compoundId_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(11, compoundId_); @@ -234,10 +238,6 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(12, outputCount_); } - if (waitCount_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, waitCount_); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -377,7 +377,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: EEHJDMLBLEE
+     * obf: AHHMJALNJOH
      *
* * Protobuf type {@code CompoundQueueData} @@ -577,7 +577,7 @@ public Builder clearOutputTime() { private int waitCount_ ; /** - * uint32 waitCount = 14; + * uint32 waitCount = 6; * @return The waitCount. */ @java.lang.Override @@ -585,7 +585,7 @@ public int getWaitCount() { return waitCount_; } /** - * uint32 waitCount = 14; + * uint32 waitCount = 6; * @param value The waitCount to set. * @return This builder for chaining. */ @@ -596,7 +596,7 @@ public Builder setWaitCount(int value) { return this; } /** - * uint32 waitCount = 14; + * uint32 waitCount = 6; * @return This builder for chaining. */ public Builder clearWaitCount() { @@ -736,7 +736,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData g java.lang.String[] descriptorData = { "\n\027CompoundQueueData.proto\"d\n\021CompoundQue" + "ueData\022\022\n\noutputTime\030\001 \001(\r\022\021\n\twaitCount\030" + - "\016 \001(\r\022\023\n\013compound_id\030\013 \001(\r\022\023\n\013outputCoun" + + "\006 \001(\r\022\023\n\013compound_id\030\013 \001(\r\022\023\n\013outputCoun" + "t\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" + "oto3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CompoundUnlockNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CompoundUnlockNotifyOuterClass.java index 21cd42634f1..eda35e25a28 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CompoundUnlockNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CompoundUnlockNotifyOuterClass.java @@ -19,15 +19,15 @@ public interface CompoundUnlockNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 compound_id = 4; + * uint32 compound_id = 1; * @return The compoundId. */ int getCompoundId(); } /** * 
-   * CmdId: 29908
-   * Obf: HEIKIOLAOKF
+   * CmdId: 28422
+   * obf: IMKJBGFLBPD
    *
* * Protobuf type {@code CompoundUnlockNotify} @@ -74,7 +74,7 @@ private CompoundUnlockNotify( case 0: done = true; break; - case 32: { + case 8: { compoundId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ private CompoundUnlockNotify( emu.grasscutter.net.proto.CompoundUnlockNotifyOuterClass.CompoundUnlockNotify.class, emu.grasscutter.net.proto.CompoundUnlockNotifyOuterClass.CompoundUnlockNotify.Builder.class); } - public static final int COMPOUND_ID_FIELD_NUMBER = 4; + public static final int COMPOUND_ID_FIELD_NUMBER = 1; private int compoundId_; /** - * uint32 compound_id = 4; + * uint32 compound_id = 1; * @return The compoundId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (compoundId_ != 0) { - output.writeUInt32(4, compoundId_); + output.writeUInt32(1, compoundId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (compoundId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, compoundId_); + .computeUInt32Size(1, compoundId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29908
-     * Obf: HEIKIOLAOKF
+     * CmdId: 28422
+     * obf: IMKJBGFLBPD
      *
* * Protobuf type {@code CompoundUnlockNotify} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int compoundId_ ; /** - * uint32 compound_id = 4; + * uint32 compound_id = 1; * @return The compoundId. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getCompoundId() { return compoundId_; } /** - * uint32 compound_id = 4; + * uint32 compound_id = 1; * @param value The compoundId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setCompoundId(int value) { return this; } /** - * uint32 compound_id = 4; + * uint32 compound_id = 1; * @return This builder for chaining. */ public Builder clearCompoundId() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.CompoundUnlockNotifyOuterClass.CompoundUnlockNo static { java.lang.String[] descriptorData = { "\n\032CompoundUnlockNotify.proto\"+\n\024Compound" + - "UnlockNotify\022\023\n\013compound_id\030\004 \001(\rB\033\n\031emu" + + "UnlockNotify\022\023\n\013compound_id\030\001 \001(\rB\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CookRecipeDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CookRecipeDataOuterClass.java index c61f092c38d..eee4dabc05c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CookRecipeDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CookRecipeDataOuterClass.java @@ -25,16 +25,12 @@ public interface CookRecipeDataOrBuilder extends int getRecipeId(); /** - * uint32 proficiency = 10; + * uint32 proficiency = 12; * @return The proficiency. */ int getProficiency(); } /** - * 
-   * Obf: LOFGLBBMMAL
-   *
- * * Protobuf type {@code CookRecipeData} */ public static final class CookRecipeData extends @@ -84,7 +80,7 @@ private CookRecipeData( recipeId_ = input.readUInt32(); break; } - case 80: { + case 96: { proficiency_ = input.readUInt32(); break; @@ -132,10 +128,10 @@ public int getRecipeId() { return recipeId_; } - public static final int PROFICIENCY_FIELD_NUMBER = 10; + public static final int PROFICIENCY_FIELD_NUMBER = 12; private int proficiency_; /** - * uint32 proficiency = 10; + * uint32 proficiency = 12; * @return The proficiency. */ @java.lang.Override @@ -161,7 +157,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeUInt32(5, recipeId_); } if (proficiency_ != 0) { - output.writeUInt32(10, proficiency_); + output.writeUInt32(12, proficiency_); } unknownFields.writeTo(output); } @@ -178,7 +174,7 @@ public int getSerializedSize() { } if (proficiency_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, proficiency_); + .computeUInt32Size(12, proficiency_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -310,10 +306,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: LOFGLBBMMAL
-     *
- * * Protobuf type {@code CookRecipeData} */ public static final class Builder extends @@ -499,7 +491,7 @@ public Builder clearRecipeId() { private int proficiency_ ; /** - * uint32 proficiency = 10; + * uint32 proficiency = 12; * @return The proficiency. */ @java.lang.Override @@ -507,7 +499,7 @@ public int getProficiency() { return proficiency_; } /** - * uint32 proficiency = 10; + * uint32 proficiency = 12; * @param value The proficiency to set. * @return This builder for chaining. */ @@ -518,7 +510,7 @@ public Builder setProficiency(int value) { return this; } /** - * uint32 proficiency = 10; + * uint32 proficiency = 12; * @return This builder for chaining. */ public Builder clearProficiency() { @@ -595,7 +587,7 @@ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData getDefa static { java.lang.String[] descriptorData = { "\n\024CookRecipeData.proto\"8\n\016CookRecipeData" + - "\022\021\n\trecipe_id\030\005 \001(\r\022\023\n\013proficiency\030\n \001(\r" + + "\022\021\n\trecipe_id\030\005 \001(\r\022\023\n\013proficiency\030\014 \001(\r" + "B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CoopCgOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CoopCgOuterClass.java index 520ed301cbc..43869dd06ac 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CoopCgOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CoopCgOuterClass.java @@ -19,20 +19,20 @@ public interface CoopCgOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 id = 5; - * @return The id. + * bool is_unlock = 14; + * @return The isUnlock. */ - int getId(); + boolean getIsUnlock(); /** - * bool is_unlock = 6; - * @return The isUnlock. + * uint32 id = 15; + * @return The id. */ - boolean getIsUnlock(); + int getId(); } /** * 
-   * Obf: OJCJONLPBME
+   * obf: FFCLAJLEAEH
    *
* * Protobuf type {@code CoopCg} @@ -79,14 +79,14 @@ private CoopCg( case 0: done = true; break; - case 40: { + case 112: { - id_ = input.readUInt32(); + isUnlock_ = input.readBool(); break; } - case 48: { + case 120: { - isUnlock_ = input.readBool(); + id_ = input.readUInt32(); break; } default: { @@ -121,26 +121,26 @@ private CoopCg( emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.class, emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder.class); } - public static final int ID_FIELD_NUMBER = 5; - private int id_; + public static final int IS_UNLOCK_FIELD_NUMBER = 14; + private boolean isUnlock_; /** - * uint32 id = 5; - * @return The id. + * bool is_unlock = 14; + * @return The isUnlock. */ @java.lang.Override - public int getId() { - return id_; + public boolean getIsUnlock() { + return isUnlock_; } - public static final int IS_UNLOCK_FIELD_NUMBER = 6; - private boolean isUnlock_; + public static final int ID_FIELD_NUMBER = 15; + private int id_; /** - * bool is_unlock = 6; - * @return The isUnlock. + * uint32 id = 15; + * @return The id. */ @java.lang.Override - public boolean getIsUnlock() { - return isUnlock_; + public int getId() { + return id_; } private byte memoizedIsInitialized = -1; @@ -157,11 +157,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (id_ != 0) { - output.writeUInt32(5, id_); - } if (isUnlock_ != false) { - output.writeBool(6, isUnlock_); + output.writeBool(14, isUnlock_); + } + if (id_ != 0) { + output.writeUInt32(15, id_); } unknownFields.writeTo(output); } @@ -172,13 +172,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (id_ != 0) { + if (isUnlock_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, id_); + .computeBoolSize(14, isUnlock_); } - if (isUnlock_ != false) { + if (id_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, isUnlock_); + .computeUInt32Size(15, id_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -195,10 +195,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg other = (emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg) obj; - if (getId() - != other.getId()) return false; if (getIsUnlock() != other.getIsUnlock()) return false; + if (getId() + != other.getId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -210,11 +210,11 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId(); hash = (37 * hash) + IS_UNLOCK_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsUnlock()); + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,7 +312,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: OJCJONLPBME
+     * obf: FFCLAJLEAEH
      *
* * Protobuf type {@code CoopCg} @@ -352,10 +352,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - id_ = 0; - isUnlock_ = false; + id_ = 0; + return this; } @@ -382,8 +382,8 @@ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg build() { @java.lang.Override public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg buildPartial() { emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg result = new emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg(this); - result.id_ = id_; result.isUnlock_ = isUnlock_; + result.id_ = id_; onBuilt(); return result; } @@ -432,12 +432,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg other) { if (other == emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.getDefaultInstance()) return this; - if (other.getId() != 0) { - setId(other.getId()); - } if (other.getIsUnlock() != false) { setIsUnlock(other.getIsUnlock()); } + if (other.getId() != 0) { + setId(other.getId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -467,64 +467,64 @@ public Builder mergeFrom( return this; } - private int id_ ; + private boolean isUnlock_ ; /** - * uint32 id = 5; - * @return The id. + * bool is_unlock = 14; + * @return The isUnlock. */ @java.lang.Override - public int getId() { - return id_; + public boolean getIsUnlock() { + return isUnlock_; } /** - * uint32 id = 5; - * @param value The id to set. + * bool is_unlock = 14; + * @param value The isUnlock to set. * @return This builder for chaining. */ - public Builder setId(int value) { + public Builder setIsUnlock(boolean value) { - id_ = value; + isUnlock_ = value; onChanged(); return this; } /** - * uint32 id = 5; + * bool is_unlock = 14; * @return This builder for chaining. */ - public Builder clearId() { + public Builder clearIsUnlock() { - id_ = 0; + isUnlock_ = false; onChanged(); return this; } - private boolean isUnlock_ ; + private int id_ ; /** - * bool is_unlock = 6; - * @return The isUnlock. + * uint32 id = 15; + * @return The id. */ @java.lang.Override - public boolean getIsUnlock() { - return isUnlock_; + public int getId() { + return id_; } /** - * bool is_unlock = 6; - * @param value The isUnlock to set. + * uint32 id = 15; + * @param value The id to set. * @return This builder for chaining. */ - public Builder setIsUnlock(boolean value) { + public Builder setId(int value) { - isUnlock_ = value; + id_ = value; onChanged(); return this; } /** - * bool is_unlock = 6; + * uint32 id = 15; * @return This builder for chaining. */ - public Builder clearIsUnlock() { + public Builder clearId() { - isUnlock_ = false; + id_ = 0; onChanged(); return this; } @@ -595,8 +595,8 @@ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg getDefaultInstanceForTy descriptor; static { java.lang.String[] descriptorData = { - "\n\014CoopCg.proto\"\'\n\006CoopCg\022\n\n\002id\030\005 \001(\r\022\021\n\t" + - "is_unlock\030\006 \001(\010B\033\n\031emu.grasscutter.net.p" + + "\n\014CoopCg.proto\"\'\n\006CoopCg\022\021\n\tis_unlock\030\016 " + + "\001(\010\022\n\n\002id\030\017 \001(\rB\033\n\031emu.grasscutter.net.p" + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -608,7 +608,7 @@ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg getDefaultInstanceForTy internal_static_CoopCg_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CoopCg_descriptor, - new java.lang.String[] { "Id", "IsUnlock", }); + new java.lang.String[] { "IsUnlock", "Id", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CoopChapterOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CoopChapterOuterClass.java index e9b530c0845..e4593dff9a2 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CoopChapterOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CoopChapterOuterClass.java @@ -19,177 +19,194 @@ public interface CoopChapterOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .CoopChapter.State state = 3; - * @return The enum numeric value on the wire for state. + * repeated uint32 FHGNBDADPBL = 1; + * @return A list containing the fHGNBDADPBL. */ - int getStateValue(); + java.util.List getFHGNBDADPBLList(); /** - * .CoopChapter.State state = 3; - * @return The state. + * repeated uint32 FHGNBDADPBL = 1; + * @return The count of fHGNBDADPBL. */ - emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State getState(); - + int getFHGNBDADPBLCount(); /** - * repeated uint32 LAAOIEBFJKP = 9; - * @return A list containing the lAAOIEBFJKP. - */ - java.util.List getLAAOIEBFJKPList(); - /** - * repeated uint32 LAAOIEBFJKP = 9; - * @return The count of lAAOIEBFJKP. - */ - int getLAAOIEBFJKPCount(); - /** - * repeated uint32 LAAOIEBFJKP = 9; + * repeated uint32 FHGNBDADPBL = 1; * @param index The index of the element to return. - * @return The lAAOIEBFJKP at the given index. + * @return The fHGNBDADPBL at the given index. */ - int getLAAOIEBFJKP(int index); + int getFHGNBDADPBL(int index); /** - * map<uint32, uint32> seen_ending_map = 15; - */ - int getSeenEndingMapCount(); - /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @return A list containing the fDHMFLAAEOG. */ - boolean containsSeenEndingMap( - int key); + java.util.List getFDHMFLAAEOGList(); /** - * Use {@link #getSeenEndingMapMap()} instead. + * repeated uint32 FDHMFLAAEOG = 3; + * @return The count of fDHMFLAAEOG. */ - @java.lang.Deprecated - java.util.Map - getSeenEndingMap(); - /** - * map<uint32, uint32> seen_ending_map = 15; - */ - java.util.Map - getSeenEndingMapMap(); + int getFDHMFLAAEOGCount(); /** - * map<uint32, uint32> seen_ending_map = 15; - */ - - int getSeenEndingMapOrDefault( - int key, - int defaultValue); - /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @param index The index of the element to return. + * @return The fDHMFLAAEOG at the given index. */ - - int getSeenEndingMapOrThrow( - int key); + int getFDHMFLAAEOG(int index); /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ java.util.List getCoopPointListList(); /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint getCoopPointList(int index); /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ int getCoopPointListCount(); /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ java.util.List getCoopPointListOrBuilderList(); /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ emu.grasscutter.net.proto.CoopPointOuterClass.CoopPointOrBuilder getCoopPointListOrBuilder( int index); /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ java.util.List getCoopRewardListList(); /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward getCoopRewardList(int index); /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ int getCoopRewardListCount(); /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ java.util.List getCoopRewardListOrBuilderList(); /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ emu.grasscutter.net.proto.CoopRewardOuterClass.CoopRewardOrBuilder getCoopRewardListOrBuilder( int index); /** - * repeated .CoopCg coop_cg_list = 8; + * .CoopChapter.State state = 8; + * @return The enum numeric value on the wire for state. + */ + int getStateValue(); + /** + * .CoopChapter.State state = 8; + * @return The state. + */ + emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State getState(); + + /** + * uint32 JOFEBPFEIJL = 9; + * @return The jOFEBPFEIJL. + */ + int getJOFEBPFEIJL(); + + /** + * repeated .CoopCg coop_cg_list = 10; */ java.util.List getCoopCgListList(); /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg getCoopCgList(int index); /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ int getCoopCgListCount(); /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ java.util.List getCoopCgListOrBuilderList(); /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ emu.grasscutter.net.proto.CoopCgOuterClass.CoopCgOrBuilder getCoopCgListOrBuilder( int index); /** - * uint32 id = 14; - * @return The id. + * map<uint32, uint32> seen_ending_map = 12; + */ + int getSeenEndingMapCount(); + /** + * map<uint32, uint32> seen_ending_map = 12; + */ + boolean containsSeenEndingMap( + int key); + /** + * Use {@link #getSeenEndingMapMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getSeenEndingMap(); + /** + * map<uint32, uint32> seen_ending_map = 12; + */ + java.util.Map + getSeenEndingMapMap(); + /** + * map<uint32, uint32> seen_ending_map = 12; + */ + + int getSeenEndingMapOrDefault( + int key, + int defaultValue); + /** + * map<uint32, uint32> seen_ending_map = 12; */ - int getId(); + + int getSeenEndingMapOrThrow( + int key); /** - * uint32 JDENGALMPJN = 13; - * @return The jDENGALMPJN. + * uint32 id = 13; + * @return The id. */ - int getJDENGALMPJN(); + int getId(); /** - * repeated uint32 EOMGDNCEACF = 7; - * @return A list containing the eOMGDNCEACF. + * repeated uint32 PJNJLNPDPKG = 14; + * @return A list containing the pJNJLNPDPKG. */ - java.util.List getEOMGDNCEACFList(); + java.util.List getPJNJLNPDPKGList(); /** - * repeated uint32 EOMGDNCEACF = 7; - * @return The count of eOMGDNCEACF. + * repeated uint32 PJNJLNPDPKG = 14; + * @return The count of pJNJLNPDPKG. */ - int getEOMGDNCEACFCount(); + int getPJNJLNPDPKGCount(); /** - * repeated uint32 EOMGDNCEACF = 7; + * repeated uint32 PJNJLNPDPKG = 14; * @param index The index of the element to return. - * @return The eOMGDNCEACF at the given index. + * @return The pJNJLNPDPKG at the given index. */ - int getEOMGDNCEACF(int index); + int getPJNJLNPDPKG(int index); /** - * uint32 HKOAKJNBIIO = 5; - * @return The hKOAKJNBIIO. + * uint32 CBOKJOBKCJO = 15; + * @return The cBOKJOBKCJO. */ - int getHKOAKJNBIIO(); + int getCBOKJOBKCJO(); } /** * 
-   * Obf: LOELOKMLPHL
+   *obf: NBHMAICJJP1O
    *
* * Protobuf type {@code CoopChapter} @@ -204,12 +221,13 @@ private CoopChapter(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private CoopChapter() { - state_ = 0; - lAAOIEBFJKP_ = emptyIntList(); + fHGNBDADPBL_ = emptyIntList(); + fDHMFLAAEOG_ = emptyIntList(); coopPointList_ = java.util.Collections.emptyList(); coopRewardList_ = java.util.Collections.emptyList(); + state_ = 0; coopCgList_ = java.util.Collections.emptyList(); - eOMGDNCEACF_ = emptyIntList(); + pJNJLNPDPKG_ = emptyIntList(); } @java.lang.Override @@ -243,78 +261,58 @@ private CoopChapter( case 0: done = true; break; - case 24: { - int rawValue = input.readEnum(); - - state_ = rawValue; - break; - } - case 40: { - - hKOAKJNBIIO_ = input.readUInt32(); - break; - } - case 50: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - coopPointList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - coopPointList_.add( - input.readMessage(emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.parser(), extensionRegistry)); - break; - } - case 56: { - if (!((mutable_bitField0_ & 0x00000020) != 0)) { - eOMGDNCEACF_ = newIntList(); - mutable_bitField0_ |= 0x00000020; + case 8: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + fHGNBDADPBL_ = newIntList(); + mutable_bitField0_ |= 0x00000001; } - eOMGDNCEACF_.addInt(input.readUInt32()); + fHGNBDADPBL_.addInt(input.readUInt32()); break; } - case 58: { + case 10: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) { - eOMGDNCEACF_ = newIntList(); - mutable_bitField0_ |= 0x00000020; + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + fHGNBDADPBL_ = newIntList(); + mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - eOMGDNCEACF_.addInt(input.readUInt32()); + fHGNBDADPBL_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 66: { - if (!((mutable_bitField0_ & 0x00000010) != 0)) { - coopCgList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - coopCgList_.add( - input.readMessage(emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.parser(), extensionRegistry)); - break; - } - case 72: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - lAAOIEBFJKP_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + case 24: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + fDHMFLAAEOG_ = newIntList(); + mutable_bitField0_ |= 0x00000002; } - lAAOIEBFJKP_.addInt(input.readUInt32()); + fDHMFLAAEOG_.addInt(input.readUInt32()); break; } - case 74: { + case 26: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - lAAOIEBFJKP_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + fDHMFLAAEOG_ = newIntList(); + mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - lAAOIEBFJKP_.addInt(input.readUInt32()); + fDHMFLAAEOG_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 90: { + case 34: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + coopPointList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + coopPointList_.add( + input.readMessage(emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.parser(), extensionRegistry)); + break; + } + case 50: { if (!((mutable_bitField0_ & 0x00000008) != 0)) { coopRewardList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -323,21 +321,31 @@ private CoopChapter( input.readMessage(emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.parser(), extensionRegistry)); break; } - case 104: { + case 64: { + int rawValue = input.readEnum(); - jDENGALMPJN_ = input.readUInt32(); + state_ = rawValue; break; } - case 112: { + case 72: { - id_ = input.readUInt32(); + jOFEBPFEIJL_ = input.readUInt32(); break; } - case 122: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + case 82: { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { + coopCgList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000010; + } + coopCgList_.add( + input.readMessage(emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.parser(), extensionRegistry)); + break; + } + case 98: { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { seenEndingMap_ = com.google.protobuf.MapField.newMapField( SeenEndingMapDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000020; } com.google.protobuf.MapEntry seenEndingMap__ = input.readMessage( @@ -346,6 +354,37 @@ private CoopChapter( seenEndingMap__.getKey(), seenEndingMap__.getValue()); break; } + case 104: { + + id_ = input.readUInt32(); + break; + } + case 112: { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { + pJNJLNPDPKG_ = newIntList(); + mutable_bitField0_ |= 0x00000040; + } + pJNJLNPDPKG_.addInt(input.readUInt32()); + break; + } + case 114: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) { + pJNJLNPDPKG_ = newIntList(); + mutable_bitField0_ |= 0x00000040; + } + while (input.getBytesUntilLimit() > 0) { + pJNJLNPDPKG_.addInt(input.readUInt32()); + } + input.popLimit(limit); + break; + } + case 120: { + + cBOKJOBKCJO_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -361,20 +400,23 @@ private CoopChapter( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + fHGNBDADPBL_.makeImmutable(); // C + } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + fDHMFLAAEOG_.makeImmutable(); // C + } if (((mutable_bitField0_ & 0x00000004) != 0)) { coopPointList_ = java.util.Collections.unmodifiableList(coopPointList_); } - if (((mutable_bitField0_ & 0x00000020) != 0)) { - eOMGDNCEACF_.makeImmutable(); // C + if (((mutable_bitField0_ & 0x00000008) != 0)) { + coopRewardList_ = java.util.Collections.unmodifiableList(coopRewardList_); } if (((mutable_bitField0_ & 0x00000010) != 0)) { coopCgList_ = java.util.Collections.unmodifiableList(coopCgList_); } - if (((mutable_bitField0_ & 0x00000001) != 0)) { - lAAOIEBFJKP_.makeImmutable(); // C - } - if (((mutable_bitField0_ & 0x00000008) != 0)) { - coopRewardList_ = java.util.Collections.unmodifiableList(coopRewardList_); + if (((mutable_bitField0_ & 0x00000040) != 0)) { + pJNJLNPDPKG_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -390,7 +432,7 @@ private CoopChapter( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 15: + case 12: return internalGetSeenEndingMap(); default: throw new RuntimeException( @@ -406,49 +448,45 @@ protected com.google.protobuf.MapField internalGetMapField( } /** - * 
-     * Obf: NDFCDJEIDEJ
-     *
- * * Protobuf enum {@code CoopChapter.State} */ public enum State implements com.google.protobuf.ProtocolMessageEnum { /** - * STATE_CLOSE = 0; + * CLOSE = 0; */ - STATE_CLOSE(0), + CLOSE(0), /** - * STATE_COND_NOT_MEET = 1; + * COND_NOT_MEET = 1; */ - STATE_COND_NOT_MEET(1), + COND_NOT_MEET(1), /** - * STATE_COND_MEET = 2; + * COND_MEET = 2; */ - STATE_COND_MEET(2), + COND_MEET(2), /** - * STATE_ACCEPT = 3; + * ACCEPT = 3; */ - STATE_ACCEPT(3), + ACCEPT(3), UNRECOGNIZED(-1), ; /** - * STATE_CLOSE = 0; + * CLOSE = 0; */ - public static final int STATE_CLOSE_VALUE = 0; + public static final int CLOSE_VALUE = 0; /** - * STATE_COND_NOT_MEET = 1; + * COND_NOT_MEET = 1; */ - public static final int STATE_COND_NOT_MEET_VALUE = 1; + public static final int COND_NOT_MEET_VALUE = 1; /** - * STATE_COND_MEET = 2; + * COND_MEET = 2; */ - public static final int STATE_COND_MEET_VALUE = 2; + public static final int COND_MEET_VALUE = 2; /** - * STATE_ACCEPT = 3; + * ACCEPT = 3; */ - public static final int STATE_ACCEPT_VALUE = 3; + public static final int ACCEPT_VALUE = 3; public final int getNumber() { @@ -475,10 +513,10 @@ public static State valueOf(int value) { */ public static State forNumber(int value) { switch (value) { - case 0: return STATE_CLOSE; - case 1: return STATE_COND_NOT_MEET; - case 2: return STATE_COND_MEET; - case 3: return STATE_ACCEPT; + case 0: return CLOSE; + case 1: return COND_NOT_MEET; + case 2: return COND_MEET; + case 3: return ACCEPT; default: return null; } } @@ -535,145 +573,73 @@ private State(int value) { // @@protoc_insertion_point(enum_scope:CoopChapter.State) } - public static final int STATE_FIELD_NUMBER = 3; - private int state_; - /** - * .CoopChapter.State state = 3; - * @return The enum numeric value on the wire for state. - */ - @java.lang.Override public int getStateValue() { - return state_; - } - /** - * .CoopChapter.State state = 3; - * @return The state. - */ - @java.lang.Override public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State getState() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State result = emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.valueOf(state_); - return result == null ? emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.UNRECOGNIZED : result; - } - - public static final int LAAOIEBFJKP_FIELD_NUMBER = 9; - private com.google.protobuf.Internal.IntList lAAOIEBFJKP_; + public static final int FHGNBDADPBL_FIELD_NUMBER = 1; + private com.google.protobuf.Internal.IntList fHGNBDADPBL_; /** - * repeated uint32 LAAOIEBFJKP = 9; - * @return A list containing the lAAOIEBFJKP. + * repeated uint32 FHGNBDADPBL = 1; + * @return A list containing the fHGNBDADPBL. */ @java.lang.Override public java.util.List - getLAAOIEBFJKPList() { - return lAAOIEBFJKP_; + getFHGNBDADPBLList() { + return fHGNBDADPBL_; } /** - * repeated uint32 LAAOIEBFJKP = 9; - * @return The count of lAAOIEBFJKP. + * repeated uint32 FHGNBDADPBL = 1; + * @return The count of fHGNBDADPBL. */ - public int getLAAOIEBFJKPCount() { - return lAAOIEBFJKP_.size(); + public int getFHGNBDADPBLCount() { + return fHGNBDADPBL_.size(); } /** - * repeated uint32 LAAOIEBFJKP = 9; + * repeated uint32 FHGNBDADPBL = 1; * @param index The index of the element to return. - * @return The lAAOIEBFJKP at the given index. + * @return The fHGNBDADPBL at the given index. */ - public int getLAAOIEBFJKP(int index) { - return lAAOIEBFJKP_.getInt(index); - } - private int lAAOIEBFJKPMemoizedSerializedSize = -1; - - public static final int SEEN_ENDING_MAP_FIELD_NUMBER = 15; - private static final class SeenEndingMapDefaultEntryHolder { - static final com.google.protobuf.MapEntry< - java.lang.Integer, java.lang.Integer> defaultEntry = - com.google.protobuf.MapEntry - .newDefaultInstance( - emu.grasscutter.net.proto.CoopChapterOuterClass.internal_static_CoopChapter_SeenEndingMapEntry_descriptor, - com.google.protobuf.WireFormat.FieldType.UINT32, - 0, - com.google.protobuf.WireFormat.FieldType.UINT32, - 0); - } - private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> seenEndingMap_; - private com.google.protobuf.MapField - internalGetSeenEndingMap() { - if (seenEndingMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - SeenEndingMapDefaultEntryHolder.defaultEntry); - } - return seenEndingMap_; + public int getFHGNBDADPBL(int index) { + return fHGNBDADPBL_.getInt(index); } + private int fHGNBDADPBLMemoizedSerializedSize = -1; - public int getSeenEndingMapCount() { - return internalGetSeenEndingMap().getMap().size(); - } - /** - * map<uint32, uint32> seen_ending_map = 15; - */ - - @java.lang.Override - public boolean containsSeenEndingMap( - int key) { - - return internalGetSeenEndingMap().getMap().containsKey(key); - } - /** - * Use {@link #getSeenEndingMapMap()} instead. - */ - @java.lang.Override - @java.lang.Deprecated - public java.util.Map getSeenEndingMap() { - return getSeenEndingMapMap(); - } + public static final int FDHMFLAAEOG_FIELD_NUMBER = 3; + private com.google.protobuf.Internal.IntList fDHMFLAAEOG_; /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @return A list containing the fDHMFLAAEOG. */ @java.lang.Override - - public java.util.Map getSeenEndingMapMap() { - return internalGetSeenEndingMap().getMap(); + public java.util.List + getFDHMFLAAEOGList() { + return fDHMFLAAEOG_; } /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @return The count of fDHMFLAAEOG. */ - @java.lang.Override - - public int getSeenEndingMapOrDefault( - int key, - int defaultValue) { - - java.util.Map map = - internalGetSeenEndingMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; + public int getFDHMFLAAEOGCount() { + return fDHMFLAAEOG_.size(); } /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @param index The index of the element to return. + * @return The fDHMFLAAEOG at the given index. */ - @java.lang.Override - - public int getSeenEndingMapOrThrow( - int key) { - - java.util.Map map = - internalGetSeenEndingMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); + public int getFDHMFLAAEOG(int index) { + return fDHMFLAAEOG_.getInt(index); } + private int fDHMFLAAEOGMemoizedSerializedSize = -1; - public static final int COOP_POINT_LIST_FIELD_NUMBER = 6; + public static final int COOP_POINT_LIST_FIELD_NUMBER = 4; private java.util.List coopPointList_; /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ @java.lang.Override public java.util.List getCoopPointListList() { return coopPointList_; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ @java.lang.Override public java.util.List @@ -681,21 +647,21 @@ public java.util.List g return coopPointList_; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ @java.lang.Override public int getCoopPointListCount() { return coopPointList_.size(); } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ @java.lang.Override public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint getCoopPointList(int index) { return coopPointList_.get(index); } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ @java.lang.Override public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPointOrBuilder getCoopPointListOrBuilder( @@ -703,17 +669,17 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPointOrBuilder getCoopP return coopPointList_.get(index); } - public static final int COOP_REWARD_LIST_FIELD_NUMBER = 11; + public static final int COOP_REWARD_LIST_FIELD_NUMBER = 6; private java.util.List coopRewardList_; /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ @java.lang.Override public java.util.List getCoopRewardListList() { return coopRewardList_; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ @java.lang.Override public java.util.List @@ -721,21 +687,21 @@ public java.util.List return coopRewardList_; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ @java.lang.Override public int getCoopRewardListCount() { return coopRewardList_.size(); } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward getCoopRewardList(int index) { return coopRewardList_.get(index); } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopRewardOrBuilder getCoopRewardListOrBuilder( @@ -743,50 +709,161 @@ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopRewardOrBuilder getCoo return coopRewardList_.get(index); } - public static final int COOP_CG_LIST_FIELD_NUMBER = 8; - private java.util.List coopCgList_; + public static final int STATE_FIELD_NUMBER = 8; + private int state_; + /** + * .CoopChapter.State state = 8; + * @return The enum numeric value on the wire for state. + */ + @java.lang.Override public int getStateValue() { + return state_; + } + /** + * .CoopChapter.State state = 8; + * @return The state. + */ + @java.lang.Override public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State getState() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State result = emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.valueOf(state_); + return result == null ? emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.UNRECOGNIZED : result; + } + + public static final int JOFEBPFEIJL_FIELD_NUMBER = 9; + private int jOFEBPFEIJL_; + /** + * uint32 JOFEBPFEIJL = 9; + * @return The jOFEBPFEIJL. + */ + @java.lang.Override + public int getJOFEBPFEIJL() { + return jOFEBPFEIJL_; + } + + public static final int COOP_CG_LIST_FIELD_NUMBER = 10; + private java.util.List coopCgList_; + /** + * repeated .CoopCg coop_cg_list = 10; + */ + @java.lang.Override + public java.util.List getCoopCgListList() { + return coopCgList_; + } + /** + * repeated .CoopCg coop_cg_list = 10; + */ + @java.lang.Override + public java.util.List + getCoopCgListOrBuilderList() { + return coopCgList_; + } + /** + * repeated .CoopCg coop_cg_list = 10; + */ + @java.lang.Override + public int getCoopCgListCount() { + return coopCgList_.size(); + } + /** + * repeated .CoopCg coop_cg_list = 10; + */ + @java.lang.Override + public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg getCoopCgList(int index) { + return coopCgList_.get(index); + } + /** + * repeated .CoopCg coop_cg_list = 10; + */ + @java.lang.Override + public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCgOrBuilder getCoopCgListOrBuilder( + int index) { + return coopCgList_.get(index); + } + + public static final int SEEN_ENDING_MAP_FIELD_NUMBER = 12; + private static final class SeenEndingMapDefaultEntryHolder { + static final com.google.protobuf.MapEntry< + java.lang.Integer, java.lang.Integer> defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + emu.grasscutter.net.proto.CoopChapterOuterClass.internal_static_CoopChapter_SeenEndingMapEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.UINT32, + 0, + com.google.protobuf.WireFormat.FieldType.UINT32, + 0); + } + private com.google.protobuf.MapField< + java.lang.Integer, java.lang.Integer> seenEndingMap_; + private com.google.protobuf.MapField + internalGetSeenEndingMap() { + if (seenEndingMap_ == null) { + return com.google.protobuf.MapField.emptyMapField( + SeenEndingMapDefaultEntryHolder.defaultEntry); + } + return seenEndingMap_; + } + + public int getSeenEndingMapCount() { + return internalGetSeenEndingMap().getMap().size(); + } /** - * repeated .CoopCg coop_cg_list = 8; + * map<uint32, uint32> seen_ending_map = 12; */ + @java.lang.Override - public java.util.List getCoopCgListList() { - return coopCgList_; + public boolean containsSeenEndingMap( + int key) { + + return internalGetSeenEndingMap().getMap().containsKey(key); } /** - * repeated .CoopCg coop_cg_list = 8; + * Use {@link #getSeenEndingMapMap()} instead. */ @java.lang.Override - public java.util.List - getCoopCgListOrBuilderList() { - return coopCgList_; + @java.lang.Deprecated + public java.util.Map getSeenEndingMap() { + return getSeenEndingMapMap(); } /** - * repeated .CoopCg coop_cg_list = 8; + * map<uint32, uint32> seen_ending_map = 12; */ @java.lang.Override - public int getCoopCgListCount() { - return coopCgList_.size(); + + public java.util.Map getSeenEndingMapMap() { + return internalGetSeenEndingMap().getMap(); } /** - * repeated .CoopCg coop_cg_list = 8; + * map<uint32, uint32> seen_ending_map = 12; */ @java.lang.Override - public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg getCoopCgList(int index) { - return coopCgList_.get(index); + + public int getSeenEndingMapOrDefault( + int key, + int defaultValue) { + + java.util.Map map = + internalGetSeenEndingMap().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * repeated .CoopCg coop_cg_list = 8; + * map<uint32, uint32> seen_ending_map = 12; */ @java.lang.Override - public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCgOrBuilder getCoopCgListOrBuilder( - int index) { - return coopCgList_.get(index); + + public int getSeenEndingMapOrThrow( + int key) { + + java.util.Map map = + internalGetSeenEndingMap().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); } - public static final int ID_FIELD_NUMBER = 14; + public static final int ID_FIELD_NUMBER = 13; private int id_; /** - * uint32 id = 14; + * uint32 id = 13; * @return The id. */ @java.lang.Override @@ -794,54 +871,43 @@ public int getId() { return id_; } - public static final int JDENGALMPJN_FIELD_NUMBER = 13; - private int jDENGALMPJN_; - /** - * uint32 JDENGALMPJN = 13; - * @return The jDENGALMPJN. - */ - @java.lang.Override - public int getJDENGALMPJN() { - return jDENGALMPJN_; - } - - public static final int EOMGDNCEACF_FIELD_NUMBER = 7; - private com.google.protobuf.Internal.IntList eOMGDNCEACF_; + public static final int PJNJLNPDPKG_FIELD_NUMBER = 14; + private com.google.protobuf.Internal.IntList pJNJLNPDPKG_; /** - * repeated uint32 EOMGDNCEACF = 7; - * @return A list containing the eOMGDNCEACF. + * repeated uint32 PJNJLNPDPKG = 14; + * @return A list containing the pJNJLNPDPKG. */ @java.lang.Override public java.util.List - getEOMGDNCEACFList() { - return eOMGDNCEACF_; + getPJNJLNPDPKGList() { + return pJNJLNPDPKG_; } /** - * repeated uint32 EOMGDNCEACF = 7; - * @return The count of eOMGDNCEACF. + * repeated uint32 PJNJLNPDPKG = 14; + * @return The count of pJNJLNPDPKG. */ - public int getEOMGDNCEACFCount() { - return eOMGDNCEACF_.size(); + public int getPJNJLNPDPKGCount() { + return pJNJLNPDPKG_.size(); } /** - * repeated uint32 EOMGDNCEACF = 7; + * repeated uint32 PJNJLNPDPKG = 14; * @param index The index of the element to return. - * @return The eOMGDNCEACF at the given index. + * @return The pJNJLNPDPKG at the given index. */ - public int getEOMGDNCEACF(int index) { - return eOMGDNCEACF_.getInt(index); + public int getPJNJLNPDPKG(int index) { + return pJNJLNPDPKG_.getInt(index); } - private int eOMGDNCEACFMemoizedSerializedSize = -1; + private int pJNJLNPDPKGMemoizedSerializedSize = -1; - public static final int HKOAKJNBIIO_FIELD_NUMBER = 5; - private int hKOAKJNBIIO_; + public static final int CBOKJOBKCJO_FIELD_NUMBER = 15; + private int cBOKJOBKCJO_; /** - * uint32 HKOAKJNBIIO = 5; - * @return The hKOAKJNBIIO. + * uint32 CBOKJOBKCJO = 15; + * @return The cBOKJOBKCJO. */ @java.lang.Override - public int getHKOAKJNBIIO() { - return hKOAKJNBIIO_; + public int getCBOKJOBKCJO() { + return cBOKJOBKCJO_; } private byte memoizedIsInitialized = -1; @@ -859,47 +925,54 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (state_ != emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.STATE_CLOSE.getNumber()) { - output.writeEnum(3, state_); - } - if (hKOAKJNBIIO_ != 0) { - output.writeUInt32(5, hKOAKJNBIIO_); + if (getFHGNBDADPBLList().size() > 0) { + output.writeUInt32NoTag(10); + output.writeUInt32NoTag(fHGNBDADPBLMemoizedSerializedSize); } - for (int i = 0; i < coopPointList_.size(); i++) { - output.writeMessage(6, coopPointList_.get(i)); - } - if (getEOMGDNCEACFList().size() > 0) { - output.writeUInt32NoTag(58); - output.writeUInt32NoTag(eOMGDNCEACFMemoizedSerializedSize); + for (int i = 0; i < fHGNBDADPBL_.size(); i++) { + output.writeUInt32NoTag(fHGNBDADPBL_.getInt(i)); } - for (int i = 0; i < eOMGDNCEACF_.size(); i++) { - output.writeUInt32NoTag(eOMGDNCEACF_.getInt(i)); - } - for (int i = 0; i < coopCgList_.size(); i++) { - output.writeMessage(8, coopCgList_.get(i)); + if (getFDHMFLAAEOGList().size() > 0) { + output.writeUInt32NoTag(26); + output.writeUInt32NoTag(fDHMFLAAEOGMemoizedSerializedSize); } - if (getLAAOIEBFJKPList().size() > 0) { - output.writeUInt32NoTag(74); - output.writeUInt32NoTag(lAAOIEBFJKPMemoizedSerializedSize); + for (int i = 0; i < fDHMFLAAEOG_.size(); i++) { + output.writeUInt32NoTag(fDHMFLAAEOG_.getInt(i)); } - for (int i = 0; i < lAAOIEBFJKP_.size(); i++) { - output.writeUInt32NoTag(lAAOIEBFJKP_.getInt(i)); + for (int i = 0; i < coopPointList_.size(); i++) { + output.writeMessage(4, coopPointList_.get(i)); } for (int i = 0; i < coopRewardList_.size(); i++) { - output.writeMessage(11, coopRewardList_.get(i)); + output.writeMessage(6, coopRewardList_.get(i)); } - if (jDENGALMPJN_ != 0) { - output.writeUInt32(13, jDENGALMPJN_); + if (state_ != emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.CLOSE.getNumber()) { + output.writeEnum(8, state_); } - if (id_ != 0) { - output.writeUInt32(14, id_); + if (jOFEBPFEIJL_ != 0) { + output.writeUInt32(9, jOFEBPFEIJL_); + } + for (int i = 0; i < coopCgList_.size(); i++) { + output.writeMessage(10, coopCgList_.get(i)); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetSeenEndingMap(), SeenEndingMapDefaultEntryHolder.defaultEntry, - 15); + 12); + if (id_ != 0) { + output.writeUInt32(13, id_); + } + if (getPJNJLNPDPKGList().size() > 0) { + output.writeUInt32NoTag(114); + output.writeUInt32NoTag(pJNJLNPDPKGMemoizedSerializedSize); + } + for (int i = 0; i < pJNJLNPDPKG_.size(); i++) { + output.writeUInt32NoTag(pJNJLNPDPKG_.getInt(i)); + } + if (cBOKJOBKCJO_ != 0) { + output.writeUInt32(15, cBOKJOBKCJO_); + } unknownFields.writeTo(output); } @@ -909,61 +982,53 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (state_ != emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.STATE_CLOSE.getNumber()) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(3, state_); - } - if (hKOAKJNBIIO_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, hKOAKJNBIIO_); - } - for (int i = 0; i < coopPointList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, coopPointList_.get(i)); - } { int dataSize = 0; - for (int i = 0; i < eOMGDNCEACF_.size(); i++) { + for (int i = 0; i < fHGNBDADPBL_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(eOMGDNCEACF_.getInt(i)); + .computeUInt32SizeNoTag(fHGNBDADPBL_.getInt(i)); } size += dataSize; - if (!getEOMGDNCEACFList().isEmpty()) { + if (!getFHGNBDADPBLList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - eOMGDNCEACFMemoizedSerializedSize = dataSize; - } - for (int i = 0; i < coopCgList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, coopCgList_.get(i)); + fHGNBDADPBLMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < lAAOIEBFJKP_.size(); i++) { + for (int i = 0; i < fDHMFLAAEOG_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(lAAOIEBFJKP_.getInt(i)); + .computeUInt32SizeNoTag(fDHMFLAAEOG_.getInt(i)); } size += dataSize; - if (!getLAAOIEBFJKPList().isEmpty()) { + if (!getFDHMFLAAEOGList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - lAAOIEBFJKPMemoizedSerializedSize = dataSize; + fDHMFLAAEOGMemoizedSerializedSize = dataSize; + } + for (int i = 0; i < coopPointList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, coopPointList_.get(i)); } for (int i = 0; i < coopRewardList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, coopRewardList_.get(i)); + .computeMessageSize(6, coopRewardList_.get(i)); } - if (jDENGALMPJN_ != 0) { + if (state_ != emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.CLOSE.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, jDENGALMPJN_); + .computeEnumSize(8, state_); } - if (id_ != 0) { + if (jOFEBPFEIJL_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(9, jOFEBPFEIJL_); + } + for (int i = 0; i < coopCgList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, id_); + .computeMessageSize(10, coopCgList_.get(i)); } for (java.util.Map.Entry entry : internalGetSeenEndingMap().getMap().entrySet()) { @@ -973,7 +1038,29 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, seenEndingMap__); + .computeMessageSize(12, seenEndingMap__); + } + if (id_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(13, id_); + } + { + int dataSize = 0; + for (int i = 0; i < pJNJLNPDPKG_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(pJNJLNPDPKG_.getInt(i)); + } + size += dataSize; + if (!getPJNJLNPDPKGList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + pJNJLNPDPKGMemoizedSerializedSize = dataSize; + } + if (cBOKJOBKCJO_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(15, cBOKJOBKCJO_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -990,25 +1077,27 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter other = (emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter) obj; - if (state_ != other.state_) return false; - if (!getLAAOIEBFJKPList() - .equals(other.getLAAOIEBFJKPList())) return false; - if (!internalGetSeenEndingMap().equals( - other.internalGetSeenEndingMap())) return false; + if (!getFHGNBDADPBLList() + .equals(other.getFHGNBDADPBLList())) return false; + if (!getFDHMFLAAEOGList() + .equals(other.getFDHMFLAAEOGList())) return false; if (!getCoopPointListList() .equals(other.getCoopPointListList())) return false; if (!getCoopRewardListList() .equals(other.getCoopRewardListList())) return false; + if (state_ != other.state_) return false; + if (getJOFEBPFEIJL() + != other.getJOFEBPFEIJL()) return false; if (!getCoopCgListList() .equals(other.getCoopCgListList())) return false; + if (!internalGetSeenEndingMap().equals( + other.internalGetSeenEndingMap())) return false; if (getId() != other.getId()) return false; - if (getJDENGALMPJN() - != other.getJDENGALMPJN()) return false; - if (!getEOMGDNCEACFList() - .equals(other.getEOMGDNCEACFList())) return false; - if (getHKOAKJNBIIO() - != other.getHKOAKJNBIIO()) return false; + if (!getPJNJLNPDPKGList() + .equals(other.getPJNJLNPDPKGList())) return false; + if (getCBOKJOBKCJO() + != other.getCBOKJOBKCJO()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -1020,15 +1109,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + STATE_FIELD_NUMBER; - hash = (53 * hash) + state_; - if (getLAAOIEBFJKPCount() > 0) { - hash = (37 * hash) + LAAOIEBFJKP_FIELD_NUMBER; - hash = (53 * hash) + getLAAOIEBFJKPList().hashCode(); + if (getFHGNBDADPBLCount() > 0) { + hash = (37 * hash) + FHGNBDADPBL_FIELD_NUMBER; + hash = (53 * hash) + getFHGNBDADPBLList().hashCode(); } - if (!internalGetSeenEndingMap().getMap().isEmpty()) { - hash = (37 * hash) + SEEN_ENDING_MAP_FIELD_NUMBER; - hash = (53 * hash) + internalGetSeenEndingMap().hashCode(); + if (getFDHMFLAAEOGCount() > 0) { + hash = (37 * hash) + FDHMFLAAEOG_FIELD_NUMBER; + hash = (53 * hash) + getFDHMFLAAEOGList().hashCode(); } if (getCoopPointListCount() > 0) { hash = (37 * hash) + COOP_POINT_LIST_FIELD_NUMBER; @@ -1038,20 +1125,26 @@ public int hashCode() { hash = (37 * hash) + COOP_REWARD_LIST_FIELD_NUMBER; hash = (53 * hash) + getCoopRewardListList().hashCode(); } + hash = (37 * hash) + STATE_FIELD_NUMBER; + hash = (53 * hash) + state_; + hash = (37 * hash) + JOFEBPFEIJL_FIELD_NUMBER; + hash = (53 * hash) + getJOFEBPFEIJL(); if (getCoopCgListCount() > 0) { hash = (37 * hash) + COOP_CG_LIST_FIELD_NUMBER; hash = (53 * hash) + getCoopCgListList().hashCode(); } + if (!internalGetSeenEndingMap().getMap().isEmpty()) { + hash = (37 * hash) + SEEN_ENDING_MAP_FIELD_NUMBER; + hash = (53 * hash) + internalGetSeenEndingMap().hashCode(); + } hash = (37 * hash) + ID_FIELD_NUMBER; hash = (53 * hash) + getId(); - hash = (37 * hash) + JDENGALMPJN_FIELD_NUMBER; - hash = (53 * hash) + getJDENGALMPJN(); - if (getEOMGDNCEACFCount() > 0) { - hash = (37 * hash) + EOMGDNCEACF_FIELD_NUMBER; - hash = (53 * hash) + getEOMGDNCEACFList().hashCode(); - } - hash = (37 * hash) + HKOAKJNBIIO_FIELD_NUMBER; - hash = (53 * hash) + getHKOAKJNBIIO(); + if (getPJNJLNPDPKGCount() > 0) { + hash = (37 * hash) + PJNJLNPDPKG_FIELD_NUMBER; + hash = (53 * hash) + getPJNJLNPDPKGList().hashCode(); + } + hash = (37 * hash) + CBOKJOBKCJO_FIELD_NUMBER; + hash = (53 * hash) + getCBOKJOBKCJO(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1149,7 +1242,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: LOELOKMLPHL
+     *obf: NBHMAICJJP1O
      *
* * Protobuf type {@code CoopChapter} @@ -1167,7 +1260,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 15: + case 12: return internalGetSeenEndingMap(); default: throw new RuntimeException( @@ -1178,7 +1271,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 15: + case 12: return internalGetMutableSeenEndingMap(); default: throw new RuntimeException( @@ -1214,11 +1307,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - state_ = 0; - - lAAOIEBFJKP_ = emptyIntList(); + fHGNBDADPBL_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - internalGetMutableSeenEndingMap().clear(); + fDHMFLAAEOG_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); if (coopPointListBuilder_ == null) { coopPointList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000004); @@ -1231,19 +1323,22 @@ public Builder clear() { } else { coopRewardListBuilder_.clear(); } + state_ = 0; + + jOFEBPFEIJL_ = 0; + if (coopCgListBuilder_ == null) { coopCgList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000010); } else { coopCgListBuilder_.clear(); } + internalGetMutableSeenEndingMap().clear(); id_ = 0; - jDENGALMPJN_ = 0; - - eOMGDNCEACF_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000020); - hKOAKJNBIIO_ = 0; + pJNJLNPDPKG_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000040); + cBOKJOBKCJO_ = 0; return this; } @@ -1272,14 +1367,16 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter build() { public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter buildPartial() { emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter result = new emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter(this); int from_bitField0_ = bitField0_; - result.state_ = state_; if (((bitField0_ & 0x00000001) != 0)) { - lAAOIEBFJKP_.makeImmutable(); + fHGNBDADPBL_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.lAAOIEBFJKP_ = lAAOIEBFJKP_; - result.seenEndingMap_ = internalGetSeenEndingMap(); - result.seenEndingMap_.makeImmutable(); + result.fHGNBDADPBL_ = fHGNBDADPBL_; + if (((bitField0_ & 0x00000002) != 0)) { + fDHMFLAAEOG_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.fDHMFLAAEOG_ = fDHMFLAAEOG_; if (coopPointListBuilder_ == null) { if (((bitField0_ & 0x00000004) != 0)) { coopPointList_ = java.util.Collections.unmodifiableList(coopPointList_); @@ -1298,6 +1395,8 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter buildPartial( } else { result.coopRewardList_ = coopRewardListBuilder_.build(); } + result.state_ = state_; + result.jOFEBPFEIJL_ = jOFEBPFEIJL_; if (coopCgListBuilder_ == null) { if (((bitField0_ & 0x00000010) != 0)) { coopCgList_ = java.util.Collections.unmodifiableList(coopCgList_); @@ -1307,14 +1406,15 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter buildPartial( } else { result.coopCgList_ = coopCgListBuilder_.build(); } + result.seenEndingMap_ = internalGetSeenEndingMap(); + result.seenEndingMap_.makeImmutable(); result.id_ = id_; - result.jDENGALMPJN_ = jDENGALMPJN_; - if (((bitField0_ & 0x00000020) != 0)) { - eOMGDNCEACF_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000020); + if (((bitField0_ & 0x00000040) != 0)) { + pJNJLNPDPKG_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000040); } - result.eOMGDNCEACF_ = eOMGDNCEACF_; - result.hKOAKJNBIIO_ = hKOAKJNBIIO_; + result.pJNJLNPDPKG_ = pJNJLNPDPKG_; + result.cBOKJOBKCJO_ = cBOKJOBKCJO_; onBuilt(); return result; } @@ -1363,21 +1463,26 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter other) { if (other == emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.getDefaultInstance()) return this; - if (other.state_ != 0) { - setStateValue(other.getStateValue()); - } - if (!other.lAAOIEBFJKP_.isEmpty()) { - if (lAAOIEBFJKP_.isEmpty()) { - lAAOIEBFJKP_ = other.lAAOIEBFJKP_; + if (!other.fHGNBDADPBL_.isEmpty()) { + if (fHGNBDADPBL_.isEmpty()) { + fHGNBDADPBL_ = other.fHGNBDADPBL_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureLAAOIEBFJKPIsMutable(); - lAAOIEBFJKP_.addAll(other.lAAOIEBFJKP_); + ensureFHGNBDADPBLIsMutable(); + fHGNBDADPBL_.addAll(other.fHGNBDADPBL_); + } + onChanged(); + } + if (!other.fDHMFLAAEOG_.isEmpty()) { + if (fDHMFLAAEOG_.isEmpty()) { + fDHMFLAAEOG_ = other.fDHMFLAAEOG_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureFDHMFLAAEOGIsMutable(); + fDHMFLAAEOG_.addAll(other.fDHMFLAAEOG_); } onChanged(); } - internalGetMutableSeenEndingMap().mergeFrom( - other.internalGetSeenEndingMap()); if (coopPointListBuilder_ == null) { if (!other.coopPointList_.isEmpty()) { if (coopPointList_.isEmpty()) { @@ -1430,6 +1535,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopCha } } } + if (other.state_ != 0) { + setStateValue(other.getStateValue()); + } + if (other.getJOFEBPFEIJL() != 0) { + setJOFEBPFEIJL(other.getJOFEBPFEIJL()); + } if (coopCgListBuilder_ == null) { if (!other.coopCgList_.isEmpty()) { if (coopCgList_.isEmpty()) { @@ -1456,24 +1567,23 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopCha } } } + internalGetMutableSeenEndingMap().mergeFrom( + other.internalGetSeenEndingMap()); if (other.getId() != 0) { setId(other.getId()); } - if (other.getJDENGALMPJN() != 0) { - setJDENGALMPJN(other.getJDENGALMPJN()); - } - if (!other.eOMGDNCEACF_.isEmpty()) { - if (eOMGDNCEACF_.isEmpty()) { - eOMGDNCEACF_ = other.eOMGDNCEACF_; - bitField0_ = (bitField0_ & ~0x00000020); + if (!other.pJNJLNPDPKG_.isEmpty()) { + if (pJNJLNPDPKG_.isEmpty()) { + pJNJLNPDPKG_ = other.pJNJLNPDPKG_; + bitField0_ = (bitField0_ & ~0x00000040); } else { - ensureEOMGDNCEACFIsMutable(); - eOMGDNCEACF_.addAll(other.eOMGDNCEACF_); + ensurePJNJLNPDPKGIsMutable(); + pJNJLNPDPKG_.addAll(other.pJNJLNPDPKG_); } onChanged(); } - if (other.getHKOAKJNBIIO() != 0) { - setHKOAKJNBIIO(other.getHKOAKJNBIIO()); + if (other.getCBOKJOBKCJO() != 0) { + setCBOKJOBKCJO(other.getCBOKJOBKCJO()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1505,264 +1615,161 @@ public Builder mergeFrom( } private int bitField0_; - private int state_ = 0; - /** - * .CoopChapter.State state = 3; - * @return The enum numeric value on the wire for state. - */ - @java.lang.Override public int getStateValue() { - return state_; - } - /** - * .CoopChapter.State state = 3; - * @param value The enum numeric value on the wire for state to set. - * @return This builder for chaining. - */ - public Builder setStateValue(int value) { - - state_ = value; - onChanged(); - return this; - } - /** - * .CoopChapter.State state = 3; - * @return The state. - */ - @java.lang.Override - public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State getState() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State result = emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.valueOf(state_); - return result == null ? emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.UNRECOGNIZED : result; - } - /** - * .CoopChapter.State state = 3; - * @param value The state to set. - * @return This builder for chaining. - */ - public Builder setState(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State value) { - if (value == null) { - throw new NullPointerException(); - } - - state_ = value.getNumber(); - onChanged(); - return this; - } - /** - * .CoopChapter.State state = 3; - * @return This builder for chaining. - */ - public Builder clearState() { - - state_ = 0; - onChanged(); - return this; - } - - private com.google.protobuf.Internal.IntList lAAOIEBFJKP_ = emptyIntList(); - private void ensureLAAOIEBFJKPIsMutable() { + private com.google.protobuf.Internal.IntList fHGNBDADPBL_ = emptyIntList(); + private void ensureFHGNBDADPBLIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - lAAOIEBFJKP_ = mutableCopy(lAAOIEBFJKP_); + fHGNBDADPBL_ = mutableCopy(fHGNBDADPBL_); bitField0_ |= 0x00000001; } } /** - * repeated uint32 LAAOIEBFJKP = 9; - * @return A list containing the lAAOIEBFJKP. + * repeated uint32 FHGNBDADPBL = 1; + * @return A list containing the fHGNBDADPBL. */ public java.util.List - getLAAOIEBFJKPList() { + getFHGNBDADPBLList() { return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(lAAOIEBFJKP_) : lAAOIEBFJKP_; + java.util.Collections.unmodifiableList(fHGNBDADPBL_) : fHGNBDADPBL_; } /** - * repeated uint32 LAAOIEBFJKP = 9; - * @return The count of lAAOIEBFJKP. + * repeated uint32 FHGNBDADPBL = 1; + * @return The count of fHGNBDADPBL. */ - public int getLAAOIEBFJKPCount() { - return lAAOIEBFJKP_.size(); + public int getFHGNBDADPBLCount() { + return fHGNBDADPBL_.size(); } /** - * repeated uint32 LAAOIEBFJKP = 9; + * repeated uint32 FHGNBDADPBL = 1; * @param index The index of the element to return. - * @return The lAAOIEBFJKP at the given index. + * @return The fHGNBDADPBL at the given index. */ - public int getLAAOIEBFJKP(int index) { - return lAAOIEBFJKP_.getInt(index); + public int getFHGNBDADPBL(int index) { + return fHGNBDADPBL_.getInt(index); } /** - * repeated uint32 LAAOIEBFJKP = 9; + * repeated uint32 FHGNBDADPBL = 1; * @param index The index to set the value at. - * @param value The lAAOIEBFJKP to set. + * @param value The fHGNBDADPBL to set. * @return This builder for chaining. */ - public Builder setLAAOIEBFJKP( + public Builder setFHGNBDADPBL( int index, int value) { - ensureLAAOIEBFJKPIsMutable(); - lAAOIEBFJKP_.setInt(index, value); + ensureFHGNBDADPBLIsMutable(); + fHGNBDADPBL_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 LAAOIEBFJKP = 9; - * @param value The lAAOIEBFJKP to add. + * repeated uint32 FHGNBDADPBL = 1; + * @param value The fHGNBDADPBL to add. * @return This builder for chaining. */ - public Builder addLAAOIEBFJKP(int value) { - ensureLAAOIEBFJKPIsMutable(); - lAAOIEBFJKP_.addInt(value); + public Builder addFHGNBDADPBL(int value) { + ensureFHGNBDADPBLIsMutable(); + fHGNBDADPBL_.addInt(value); onChanged(); return this; } /** - * repeated uint32 LAAOIEBFJKP = 9; - * @param values The lAAOIEBFJKP to add. + * repeated uint32 FHGNBDADPBL = 1; + * @param values The fHGNBDADPBL to add. * @return This builder for chaining. */ - public Builder addAllLAAOIEBFJKP( + public Builder addAllFHGNBDADPBL( java.lang.Iterable values) { - ensureLAAOIEBFJKPIsMutable(); + ensureFHGNBDADPBLIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, lAAOIEBFJKP_); + values, fHGNBDADPBL_); onChanged(); return this; } /** - * repeated uint32 LAAOIEBFJKP = 9; + * repeated uint32 FHGNBDADPBL = 1; * @return This builder for chaining. */ - public Builder clearLAAOIEBFJKP() { - lAAOIEBFJKP_ = emptyIntList(); + public Builder clearFHGNBDADPBL() { + fHGNBDADPBL_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } - private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> seenEndingMap_; - private com.google.protobuf.MapField - internalGetSeenEndingMap() { - if (seenEndingMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - SeenEndingMapDefaultEntryHolder.defaultEntry); - } - return seenEndingMap_; - } - private com.google.protobuf.MapField - internalGetMutableSeenEndingMap() { - onChanged();; - if (seenEndingMap_ == null) { - seenEndingMap_ = com.google.protobuf.MapField.newMapField( - SeenEndingMapDefaultEntryHolder.defaultEntry); - } - if (!seenEndingMap_.isMutable()) { - seenEndingMap_ = seenEndingMap_.copy(); - } - return seenEndingMap_; - } - - public int getSeenEndingMapCount() { - return internalGetSeenEndingMap().getMap().size(); - } - /** - * map<uint32, uint32> seen_ending_map = 15; - */ - - @java.lang.Override - public boolean containsSeenEndingMap( - int key) { - - return internalGetSeenEndingMap().getMap().containsKey(key); - } - /** - * Use {@link #getSeenEndingMapMap()} instead. - */ - @java.lang.Override - @java.lang.Deprecated - public java.util.Map getSeenEndingMap() { - return getSeenEndingMapMap(); - } - /** - * map<uint32, uint32> seen_ending_map = 15; - */ - @java.lang.Override - - public java.util.Map getSeenEndingMapMap() { - return internalGetSeenEndingMap().getMap(); - } - /** - * map<uint32, uint32> seen_ending_map = 15; - */ - @java.lang.Override - - public int getSeenEndingMapOrDefault( - int key, - int defaultValue) { - - java.util.Map map = - internalGetSeenEndingMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; + private com.google.protobuf.Internal.IntList fDHMFLAAEOG_ = emptyIntList(); + private void ensureFDHMFLAAEOGIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + fDHMFLAAEOG_ = mutableCopy(fDHMFLAAEOG_); + bitField0_ |= 0x00000002; + } } /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @return A list containing the fDHMFLAAEOG. */ - @java.lang.Override - - public int getSeenEndingMapOrThrow( - int key) { - - java.util.Map map = - internalGetSeenEndingMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); + public java.util.List + getFDHMFLAAEOGList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(fDHMFLAAEOG_) : fDHMFLAAEOG_; } - - public Builder clearSeenEndingMap() { - internalGetMutableSeenEndingMap().getMutableMap() - .clear(); - return this; + /** + * repeated uint32 FDHMFLAAEOG = 3; + * @return The count of fDHMFLAAEOG. + */ + public int getFDHMFLAAEOGCount() { + return fDHMFLAAEOG_.size(); } /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @param index The index of the element to return. + * @return The fDHMFLAAEOG at the given index. */ - - public Builder removeSeenEndingMap( - int key) { - - internalGetMutableSeenEndingMap().getMutableMap() - .remove(key); + public int getFDHMFLAAEOG(int index) { + return fDHMFLAAEOG_.getInt(index); + } + /** + * repeated uint32 FDHMFLAAEOG = 3; + * @param index The index to set the value at. + * @param value The fDHMFLAAEOG to set. + * @return This builder for chaining. + */ + public Builder setFDHMFLAAEOG( + int index, int value) { + ensureFDHMFLAAEOGIsMutable(); + fDHMFLAAEOG_.setInt(index, value); + onChanged(); return this; } /** - * Use alternate mutation accessors instead. + * repeated uint32 FDHMFLAAEOG = 3; + * @param value The fDHMFLAAEOG to add. + * @return This builder for chaining. */ - @java.lang.Deprecated - public java.util.Map - getMutableSeenEndingMap() { - return internalGetMutableSeenEndingMap().getMutableMap(); + public Builder addFDHMFLAAEOG(int value) { + ensureFDHMFLAAEOGIsMutable(); + fDHMFLAAEOG_.addInt(value); + onChanged(); + return this; } /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @param values The fDHMFLAAEOG to add. + * @return This builder for chaining. */ - public Builder putSeenEndingMap( - int key, - int value) { - - - internalGetMutableSeenEndingMap().getMutableMap() - .put(key, value); + public Builder addAllFDHMFLAAEOG( + java.lang.Iterable values) { + ensureFDHMFLAAEOGIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, fDHMFLAAEOG_); + onChanged(); return this; } /** - * map<uint32, uint32> seen_ending_map = 15; + * repeated uint32 FDHMFLAAEOG = 3; + * @return This builder for chaining. */ - - public Builder putAllSeenEndingMap( - java.util.Map values) { - internalGetMutableSeenEndingMap().getMutableMap() - .putAll(values); + public Builder clearFDHMFLAAEOG() { + fDHMFLAAEOG_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); return this; } @@ -1779,7 +1786,7 @@ private void ensureCoopPointListIsMutable() { emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint, emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.Builder, emu.grasscutter.net.proto.CoopPointOuterClass.CoopPointOrBuilder> coopPointListBuilder_; /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public java.util.List getCoopPointListList() { if (coopPointListBuilder_ == null) { @@ -1789,7 +1796,7 @@ public java.util.List g } } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public int getCoopPointListCount() { if (coopPointListBuilder_ == null) { @@ -1799,7 +1806,7 @@ public int getCoopPointListCount() { } } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint getCoopPointList(int index) { if (coopPointListBuilder_ == null) { @@ -1809,7 +1816,7 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint getCoopPointList( } } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder setCoopPointList( int index, emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint value) { @@ -1826,7 +1833,7 @@ public Builder setCoopPointList( return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder setCoopPointList( int index, emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.Builder builderForValue) { @@ -1840,7 +1847,7 @@ public Builder setCoopPointList( return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder addCoopPointList(emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint value) { if (coopPointListBuilder_ == null) { @@ -1856,7 +1863,7 @@ public Builder addCoopPointList(emu.grasscutter.net.proto.CoopPointOuterClass.Co return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder addCoopPointList( int index, emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint value) { @@ -1873,7 +1880,7 @@ public Builder addCoopPointList( return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder addCoopPointList( emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.Builder builderForValue) { @@ -1887,7 +1894,7 @@ public Builder addCoopPointList( return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder addCoopPointList( int index, emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.Builder builderForValue) { @@ -1901,7 +1908,7 @@ public Builder addCoopPointList( return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder addAllCoopPointList( java.lang.Iterable values) { @@ -1916,7 +1923,7 @@ public Builder addAllCoopPointList( return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder clearCoopPointList() { if (coopPointListBuilder_ == null) { @@ -1929,7 +1936,7 @@ public Builder clearCoopPointList() { return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public Builder removeCoopPointList(int index) { if (coopPointListBuilder_ == null) { @@ -1942,14 +1949,14 @@ public Builder removeCoopPointList(int index) { return this; } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.Builder getCoopPointListBuilder( int index) { return getCoopPointListFieldBuilder().getBuilder(index); } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPointOrBuilder getCoopPointListOrBuilder( int index) { @@ -1959,7 +1966,7 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPointOrBuilder getCoopP } } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public java.util.List getCoopPointListOrBuilderList() { @@ -1970,14 +1977,14 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPointOrBuilder getCoopP } } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.Builder addCoopPointListBuilder() { return getCoopPointListFieldBuilder().addBuilder( emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.getDefaultInstance()); } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.Builder addCoopPointListBuilder( int index) { @@ -1985,7 +1992,7 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.Builder addCoopPo index, emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.getDefaultInstance()); } /** - * repeated .CoopPoint coop_point_list = 6; + * repeated .CoopPoint coop_point_list = 4; */ public java.util.List getCoopPointListBuilderList() { @@ -2019,7 +2026,7 @@ private void ensureCoopRewardListIsMutable() { emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward, emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder, emu.grasscutter.net.proto.CoopRewardOuterClass.CoopRewardOrBuilder> coopRewardListBuilder_; /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public java.util.List getCoopRewardListList() { if (coopRewardListBuilder_ == null) { @@ -2029,7 +2036,7 @@ public java.util.List } } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public int getCoopRewardListCount() { if (coopRewardListBuilder_ == null) { @@ -2039,7 +2046,7 @@ public int getCoopRewardListCount() { } } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward getCoopRewardList(int index) { if (coopRewardListBuilder_ == null) { @@ -2049,7 +2056,7 @@ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward getCoopRewardLi } } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder setCoopRewardList( int index, emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward value) { @@ -2066,7 +2073,7 @@ public Builder setCoopRewardList( return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder setCoopRewardList( int index, emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder builderForValue) { @@ -2080,7 +2087,7 @@ public Builder setCoopRewardList( return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder addCoopRewardList(emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward value) { if (coopRewardListBuilder_ == null) { @@ -2096,7 +2103,7 @@ public Builder addCoopRewardList(emu.grasscutter.net.proto.CoopRewardOuterClass. return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder addCoopRewardList( int index, emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward value) { @@ -2113,7 +2120,7 @@ public Builder addCoopRewardList( return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder addCoopRewardList( emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder builderForValue) { @@ -2127,7 +2134,7 @@ public Builder addCoopRewardList( return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder addCoopRewardList( int index, emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder builderForValue) { @@ -2141,7 +2148,7 @@ public Builder addCoopRewardList( return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder addAllCoopRewardList( java.lang.Iterable values) { @@ -2156,7 +2163,7 @@ public Builder addAllCoopRewardList( return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder clearCoopRewardList() { if (coopRewardListBuilder_ == null) { @@ -2169,7 +2176,7 @@ public Builder clearCoopRewardList() { return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public Builder removeCoopRewardList(int index) { if (coopRewardListBuilder_ == null) { @@ -2182,14 +2189,14 @@ public Builder removeCoopRewardList(int index) { return this; } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder getCoopRewardListBuilder( int index) { return getCoopRewardListFieldBuilder().getBuilder(index); } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopRewardOrBuilder getCoopRewardListOrBuilder( int index) { @@ -2199,7 +2206,7 @@ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopRewardOrBuilder getCoo } } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public java.util.List getCoopRewardListOrBuilderList() { @@ -2210,14 +2217,14 @@ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopRewardOrBuilder getCoo } } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder addCoopRewardListBuilder() { return getCoopRewardListFieldBuilder().addBuilder( emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.getDefaultInstance()); } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder addCoopRewardListBuilder( int index) { @@ -2225,7 +2232,7 @@ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder addCoop index, emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.getDefaultInstance()); } /** - * repeated .CoopReward coop_reward_list = 11; + * repeated .CoopReward coop_reward_list = 6; */ public java.util.List getCoopRewardListBuilderList() { @@ -2246,6 +2253,91 @@ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.Builder addCoop return coopRewardListBuilder_; } + private int state_ = 0; + /** + * .CoopChapter.State state = 8; + * @return The enum numeric value on the wire for state. + */ + @java.lang.Override public int getStateValue() { + return state_; + } + /** + * .CoopChapter.State state = 8; + * @param value The enum numeric value on the wire for state to set. + * @return This builder for chaining. + */ + public Builder setStateValue(int value) { + + state_ = value; + onChanged(); + return this; + } + /** + * .CoopChapter.State state = 8; + * @return The state. + */ + @java.lang.Override + public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State getState() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State result = emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.valueOf(state_); + return result == null ? emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State.UNRECOGNIZED : result; + } + /** + * .CoopChapter.State state = 8; + * @param value The state to set. + * @return This builder for chaining. + */ + public Builder setState(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.State value) { + if (value == null) { + throw new NullPointerException(); + } + + state_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .CoopChapter.State state = 8; + * @return This builder for chaining. + */ + public Builder clearState() { + + state_ = 0; + onChanged(); + return this; + } + + private int jOFEBPFEIJL_ ; + /** + * uint32 JOFEBPFEIJL = 9; + * @return The jOFEBPFEIJL. + */ + @java.lang.Override + public int getJOFEBPFEIJL() { + return jOFEBPFEIJL_; + } + /** + * uint32 JOFEBPFEIJL = 9; + * @param value The jOFEBPFEIJL to set. + * @return This builder for chaining. + */ + public Builder setJOFEBPFEIJL(int value) { + + jOFEBPFEIJL_ = value; + onChanged(); + return this; + } + /** + * uint32 JOFEBPFEIJL = 9; + * @return This builder for chaining. + */ + public Builder clearJOFEBPFEIJL() { + + jOFEBPFEIJL_ = 0; + onChanged(); + return this; + } + private java.util.List coopCgList_ = java.util.Collections.emptyList(); private void ensureCoopCgListIsMutable() { @@ -2259,7 +2351,7 @@ private void ensureCoopCgListIsMutable() { emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg, emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder, emu.grasscutter.net.proto.CoopCgOuterClass.CoopCgOrBuilder> coopCgListBuilder_; /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public java.util.List getCoopCgListList() { if (coopCgListBuilder_ == null) { @@ -2269,7 +2361,7 @@ public java.util.List getCoop } } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public int getCoopCgListCount() { if (coopCgListBuilder_ == null) { @@ -2279,7 +2371,7 @@ public int getCoopCgListCount() { } } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg getCoopCgList(int index) { if (coopCgListBuilder_ == null) { @@ -2289,7 +2381,7 @@ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg getCoopCgList(int index } } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder setCoopCgList( int index, emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg value) { @@ -2306,7 +2398,7 @@ public Builder setCoopCgList( return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder setCoopCgList( int index, emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder builderForValue) { @@ -2320,7 +2412,7 @@ public Builder setCoopCgList( return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder addCoopCgList(emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg value) { if (coopCgListBuilder_ == null) { @@ -2336,7 +2428,7 @@ public Builder addCoopCgList(emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg v return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder addCoopCgList( int index, emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg value) { @@ -2353,7 +2445,7 @@ public Builder addCoopCgList( return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder addCoopCgList( emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder builderForValue) { @@ -2367,7 +2459,7 @@ public Builder addCoopCgList( return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder addCoopCgList( int index, emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder builderForValue) { @@ -2381,7 +2473,7 @@ public Builder addCoopCgList( return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder addAllCoopCgList( java.lang.Iterable values) { @@ -2396,7 +2488,7 @@ public Builder addAllCoopCgList( return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder clearCoopCgList() { if (coopCgListBuilder_ == null) { @@ -2409,7 +2501,7 @@ public Builder clearCoopCgList() { return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public Builder removeCoopCgList(int index) { if (coopCgListBuilder_ == null) { @@ -2422,14 +2514,14 @@ public Builder removeCoopCgList(int index) { return this; } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder getCoopCgListBuilder( int index) { return getCoopCgListFieldBuilder().getBuilder(index); } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCgOrBuilder getCoopCgListOrBuilder( int index) { @@ -2439,7 +2531,7 @@ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCgOrBuilder getCoopCgListO } } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public java.util.List getCoopCgListOrBuilderList() { @@ -2450,14 +2542,14 @@ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCgOrBuilder getCoopCgListO } } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder addCoopCgListBuilder() { return getCoopCgListFieldBuilder().addBuilder( emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.getDefaultInstance()); } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder addCoopCgListBuilder( int index) { @@ -2465,7 +2557,7 @@ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder addCoopCgListBu index, emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.getDefaultInstance()); } /** - * repeated .CoopCg coop_cg_list = 8; + * repeated .CoopCg coop_cg_list = 10; */ public java.util.List getCoopCgListBuilderList() { @@ -2486,174 +2578,271 @@ public emu.grasscutter.net.proto.CoopCgOuterClass.CoopCg.Builder addCoopCgListBu return coopCgListBuilder_; } - private int id_ ; + private com.google.protobuf.MapField< + java.lang.Integer, java.lang.Integer> seenEndingMap_; + private com.google.protobuf.MapField + internalGetSeenEndingMap() { + if (seenEndingMap_ == null) { + return com.google.protobuf.MapField.emptyMapField( + SeenEndingMapDefaultEntryHolder.defaultEntry); + } + return seenEndingMap_; + } + private com.google.protobuf.MapField + internalGetMutableSeenEndingMap() { + onChanged();; + if (seenEndingMap_ == null) { + seenEndingMap_ = com.google.protobuf.MapField.newMapField( + SeenEndingMapDefaultEntryHolder.defaultEntry); + } + if (!seenEndingMap_.isMutable()) { + seenEndingMap_ = seenEndingMap_.copy(); + } + return seenEndingMap_; + } + + public int getSeenEndingMapCount() { + return internalGetSeenEndingMap().getMap().size(); + } /** - * uint32 id = 14; - * @return The id. + * map<uint32, uint32> seen_ending_map = 12; */ + @java.lang.Override - public int getId() { - return id_; + public boolean containsSeenEndingMap( + int key) { + + return internalGetSeenEndingMap().getMap().containsKey(key); } /** - * uint32 id = 14; - * @param value The id to set. - * @return This builder for chaining. + * Use {@link #getSeenEndingMapMap()} instead. */ - public Builder setId(int value) { + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getSeenEndingMap() { + return getSeenEndingMapMap(); + } + /** + * map<uint32, uint32> seen_ending_map = 12; + */ + @java.lang.Override + + public java.util.Map getSeenEndingMapMap() { + return internalGetSeenEndingMap().getMap(); + } + /** + * map<uint32, uint32> seen_ending_map = 12; + */ + @java.lang.Override + + public int getSeenEndingMapOrDefault( + int key, + int defaultValue) { - id_ = value; - onChanged(); + java.util.Map map = + internalGetSeenEndingMap().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * map<uint32, uint32> seen_ending_map = 12; + */ + @java.lang.Override + + public int getSeenEndingMapOrThrow( + int key) { + + java.util.Map map = + internalGetSeenEndingMap().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearSeenEndingMap() { + internalGetMutableSeenEndingMap().getMutableMap() + .clear(); return this; } /** - * uint32 id = 14; - * @return This builder for chaining. + * map<uint32, uint32> seen_ending_map = 12; */ - public Builder clearId() { + + public Builder removeSeenEndingMap( + int key) { - id_ = 0; - onChanged(); + internalGetMutableSeenEndingMap().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableSeenEndingMap() { + return internalGetMutableSeenEndingMap().getMutableMap(); + } + /** + * map<uint32, uint32> seen_ending_map = 12; + */ + public Builder putSeenEndingMap( + int key, + int value) { + + + internalGetMutableSeenEndingMap().getMutableMap() + .put(key, value); + return this; + } + /** + * map<uint32, uint32> seen_ending_map = 12; + */ + + public Builder putAllSeenEndingMap( + java.util.Map values) { + internalGetMutableSeenEndingMap().getMutableMap() + .putAll(values); return this; } - private int jDENGALMPJN_ ; + private int id_ ; /** - * uint32 JDENGALMPJN = 13; - * @return The jDENGALMPJN. + * uint32 id = 13; + * @return The id. */ @java.lang.Override - public int getJDENGALMPJN() { - return jDENGALMPJN_; + public int getId() { + return id_; } /** - * uint32 JDENGALMPJN = 13; - * @param value The jDENGALMPJN to set. + * uint32 id = 13; + * @param value The id to set. * @return This builder for chaining. */ - public Builder setJDENGALMPJN(int value) { + public Builder setId(int value) { - jDENGALMPJN_ = value; + id_ = value; onChanged(); return this; } /** - * uint32 JDENGALMPJN = 13; + * uint32 id = 13; * @return This builder for chaining. */ - public Builder clearJDENGALMPJN() { + public Builder clearId() { - jDENGALMPJN_ = 0; + id_ = 0; onChanged(); return this; } - private com.google.protobuf.Internal.IntList eOMGDNCEACF_ = emptyIntList(); - private void ensureEOMGDNCEACFIsMutable() { - if (!((bitField0_ & 0x00000020) != 0)) { - eOMGDNCEACF_ = mutableCopy(eOMGDNCEACF_); - bitField0_ |= 0x00000020; + private com.google.protobuf.Internal.IntList pJNJLNPDPKG_ = emptyIntList(); + private void ensurePJNJLNPDPKGIsMutable() { + if (!((bitField0_ & 0x00000040) != 0)) { + pJNJLNPDPKG_ = mutableCopy(pJNJLNPDPKG_); + bitField0_ |= 0x00000040; } } /** - * repeated uint32 EOMGDNCEACF = 7; - * @return A list containing the eOMGDNCEACF. + * repeated uint32 PJNJLNPDPKG = 14; + * @return A list containing the pJNJLNPDPKG. */ public java.util.List - getEOMGDNCEACFList() { - return ((bitField0_ & 0x00000020) != 0) ? - java.util.Collections.unmodifiableList(eOMGDNCEACF_) : eOMGDNCEACF_; + getPJNJLNPDPKGList() { + return ((bitField0_ & 0x00000040) != 0) ? + java.util.Collections.unmodifiableList(pJNJLNPDPKG_) : pJNJLNPDPKG_; } /** - * repeated uint32 EOMGDNCEACF = 7; - * @return The count of eOMGDNCEACF. + * repeated uint32 PJNJLNPDPKG = 14; + * @return The count of pJNJLNPDPKG. */ - public int getEOMGDNCEACFCount() { - return eOMGDNCEACF_.size(); + public int getPJNJLNPDPKGCount() { + return pJNJLNPDPKG_.size(); } /** - * repeated uint32 EOMGDNCEACF = 7; + * repeated uint32 PJNJLNPDPKG = 14; * @param index The index of the element to return. - * @return The eOMGDNCEACF at the given index. + * @return The pJNJLNPDPKG at the given index. */ - public int getEOMGDNCEACF(int index) { - return eOMGDNCEACF_.getInt(index); + public int getPJNJLNPDPKG(int index) { + return pJNJLNPDPKG_.getInt(index); } /** - * repeated uint32 EOMGDNCEACF = 7; + * repeated uint32 PJNJLNPDPKG = 14; * @param index The index to set the value at. - * @param value The eOMGDNCEACF to set. + * @param value The pJNJLNPDPKG to set. * @return This builder for chaining. */ - public Builder setEOMGDNCEACF( + public Builder setPJNJLNPDPKG( int index, int value) { - ensureEOMGDNCEACFIsMutable(); - eOMGDNCEACF_.setInt(index, value); + ensurePJNJLNPDPKGIsMutable(); + pJNJLNPDPKG_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 EOMGDNCEACF = 7; - * @param value The eOMGDNCEACF to add. + * repeated uint32 PJNJLNPDPKG = 14; + * @param value The pJNJLNPDPKG to add. * @return This builder for chaining. */ - public Builder addEOMGDNCEACF(int value) { - ensureEOMGDNCEACFIsMutable(); - eOMGDNCEACF_.addInt(value); + public Builder addPJNJLNPDPKG(int value) { + ensurePJNJLNPDPKGIsMutable(); + pJNJLNPDPKG_.addInt(value); onChanged(); return this; } /** - * repeated uint32 EOMGDNCEACF = 7; - * @param values The eOMGDNCEACF to add. + * repeated uint32 PJNJLNPDPKG = 14; + * @param values The pJNJLNPDPKG to add. * @return This builder for chaining. */ - public Builder addAllEOMGDNCEACF( + public Builder addAllPJNJLNPDPKG( java.lang.Iterable values) { - ensureEOMGDNCEACFIsMutable(); + ensurePJNJLNPDPKGIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, eOMGDNCEACF_); + values, pJNJLNPDPKG_); onChanged(); return this; } /** - * repeated uint32 EOMGDNCEACF = 7; + * repeated uint32 PJNJLNPDPKG = 14; * @return This builder for chaining. */ - public Builder clearEOMGDNCEACF() { - eOMGDNCEACF_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000020); + public Builder clearPJNJLNPDPKG() { + pJNJLNPDPKG_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; } - private int hKOAKJNBIIO_ ; + private int cBOKJOBKCJO_ ; /** - * uint32 HKOAKJNBIIO = 5; - * @return The hKOAKJNBIIO. + * uint32 CBOKJOBKCJO = 15; + * @return The cBOKJOBKCJO. */ @java.lang.Override - public int getHKOAKJNBIIO() { - return hKOAKJNBIIO_; + public int getCBOKJOBKCJO() { + return cBOKJOBKCJO_; } /** - * uint32 HKOAKJNBIIO = 5; - * @param value The hKOAKJNBIIO to set. + * uint32 CBOKJOBKCJO = 15; + * @param value The cBOKJOBKCJO to set. * @return This builder for chaining. */ - public Builder setHKOAKJNBIIO(int value) { + public Builder setCBOKJOBKCJO(int value) { - hKOAKJNBIIO_ = value; + cBOKJOBKCJO_ = value; onChanged(); return this; } /** - * uint32 HKOAKJNBIIO = 5; + * uint32 CBOKJOBKCJO = 15; * @return This builder for chaining. */ - public Builder clearHKOAKJNBIIO() { + public Builder clearCBOKJOBKCJO() { - hKOAKJNBIIO_ = 0; + cBOKJOBKCJO_ = 0; onChanged(); return this; } @@ -2730,20 +2919,19 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getDefaultIns static { java.lang.String[] descriptorData = { "\n\021CoopChapter.proto\032\017CoopPoint.proto\032\020Co" + - "opReward.proto\032\014CoopCg.proto\"\305\003\n\013CoopCha" + - "pter\022!\n\005state\030\003 \001(\0162\022.CoopChapter.State\022" + - "\023\n\013LAAOIEBFJKP\030\t \003(\r\0228\n\017seen_ending_map\030" + - "\017 \003(\0132\037.CoopChapter.SeenEndingMapEntry\022#" + - "\n\017coop_point_list\030\006 \003(\0132\n.CoopPoint\022%\n\020c" + - "oop_reward_list\030\013 \003(\0132\013.CoopReward\022\035\n\014co" + - "op_cg_list\030\010 \003(\0132\007.CoopCg\022\n\n\002id\030\016 \001(\r\022\023\n" + - "\013JDENGALMPJN\030\r \001(\r\022\023\n\013EOMGDNCEACF\030\007 \003(\r\022" + - "\023\n\013HKOAKJNBIIO\030\005 \001(\r\0324\n\022SeenEndingMapEnt" + - "ry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\"X\n\005St" + - "ate\022\017\n\013STATE_CLOSE\020\000\022\027\n\023STATE_COND_NOT_M" + - "EET\020\001\022\023\n\017STATE_COND_MEET\020\002\022\020\n\014STATE_ACCE" + - "PT\020\003B\033\n\031emu.grasscutter.net.protob\006proto" + - "3" + "opReward.proto\032\014CoopCg.proto\"\302\003\n\013CoopCha" + + "pter\022\023\n\013FHGNBDADPBL\030\001 \003(\r\022\023\n\013FDHMFLAAEOG" + + "\030\003 \003(\r\022#\n\017coop_point_list\030\004 \003(\0132\n.CoopPo" + + "int\022%\n\020coop_reward_list\030\006 \003(\0132\013.CoopRewa" + + "rd\022!\n\005state\030\010 \001(\0162\022.CoopChapter.State\022\023\n" + + "\013JOFEBPFEIJL\030\t \001(\r\022\035\n\014coop_cg_list\030\n \003(\013" + + "2\007.CoopCg\0228\n\017seen_ending_map\030\014 \003(\0132\037.Coo" + + "pChapter.SeenEndingMapEntry\022\n\n\002id\030\r \001(\r\022" + + "\023\n\013PJNJLNPDPKG\030\016 \003(\r\022\023\n\013CBOKJOBKCJO\030\017 \001(" + + "\r\0324\n\022SeenEndingMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005" + + "value\030\002 \001(\r:\0028\001\"@\n\005State\022\t\n\005CLOSE\020\000\022\021\n\rC" + + "OND_NOT_MEET\020\001\022\r\n\tCOND_MEET\020\002\022\n\n\006ACCEPT\020" + + "\003B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -2757,7 +2945,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getDefaultIns internal_static_CoopChapter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CoopChapter_descriptor, - new java.lang.String[] { "State", "LAAOIEBFJKP", "SeenEndingMap", "CoopPointList", "CoopRewardList", "CoopCgList", "Id", "JDENGALMPJN", "EOMGDNCEACF", "HKOAKJNBIIO", }); + new java.lang.String[] { "FHGNBDADPBL", "FDHMFLAAEOG", "CoopPointList", "CoopRewardList", "State", "JOFEBPFEIJL", "CoopCgList", "SeenEndingMap", "Id", "PJNJLNPDPKG", "CBOKJOBKCJO", }); internal_static_CoopChapter_SeenEndingMapEntry_descriptor = internal_static_CoopChapter_descriptor.getNestedTypes().get(0); internal_static_CoopChapter_SeenEndingMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CoopChapterUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CoopChapterUpdateNotifyOuterClass.java index 639085024ca..8402da0f028 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CoopChapterUpdateNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CoopChapterUpdateNotifyOuterClass.java @@ -19,33 +19,33 @@ public interface CoopChapterUpdateNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ java.util.List getChapterListList(); /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getChapterList(int index); /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ int getChapterListCount(); /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ java.util.List getChapterListOrBuilderList(); /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getChapterListOrBuilder( int index); } /** * 
-   * CmdId: 6932
-   * Obf: CJCEEDJNAAB
+   * CmdId: 6478
+   * obf: GBOBJGMJKNL
    *
* * Protobuf type {@code CoopChapterUpdateNotify} @@ -94,7 +94,7 @@ private CoopChapterUpdateNotify( case 0: done = true; break; - case 10: { + case 114: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { chapterList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -138,17 +138,17 @@ private CoopChapterUpdateNotify( emu.grasscutter.net.proto.CoopChapterUpdateNotifyOuterClass.CoopChapterUpdateNotify.class, emu.grasscutter.net.proto.CoopChapterUpdateNotifyOuterClass.CoopChapterUpdateNotify.Builder.class); } - public static final int CHAPTER_LIST_FIELD_NUMBER = 1; + public static final int CHAPTER_LIST_FIELD_NUMBER = 14; private java.util.List chapterList_; /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ @java.lang.Override public java.util.List getChapterListList() { return chapterList_; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ @java.lang.Override public java.util.List @@ -156,21 +156,21 @@ public java.util.Listrepeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ @java.lang.Override public int getChapterListCount() { return chapterList_.size(); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ @java.lang.Override public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getChapterList(int index) { return chapterList_.get(index); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ @java.lang.Override public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getChapterListOrBuilder( @@ -193,7 +193,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < chapterList_.size(); i++) { - output.writeMessage(1, chapterList_.get(i)); + output.writeMessage(14, chapterList_.get(i)); } unknownFields.writeTo(output); } @@ -206,7 +206,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < chapterList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, chapterList_.get(i)); + .computeMessageSize(14, chapterList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -337,8 +337,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 6932
-     * Obf: CJCEEDJNAAB
+     * CmdId: 6478
+     * obf: GBOBJGMJKNL
      *
* * Protobuf type {@code CoopChapterUpdateNotify} @@ -538,7 +538,7 @@ private void ensureChapterListIsMutable() { emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder> chapterListBuilder_; /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public java.util.List getChapterListList() { if (chapterListBuilder_ == null) { @@ -548,7 +548,7 @@ public java.util.Listrepeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public int getChapterListCount() { if (chapterListBuilder_ == null) { @@ -558,7 +558,7 @@ public int getChapterListCount() { } } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getChapterList(int index) { if (chapterListBuilder_ == null) { @@ -568,7 +568,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getChapterLis } } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder setChapterList( int index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter value) { @@ -585,7 +585,7 @@ public Builder setChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder setChapterList( int index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder builderForValue) { @@ -599,7 +599,7 @@ public Builder setChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder addChapterList(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter value) { if (chapterListBuilder_ == null) { @@ -615,7 +615,7 @@ public Builder addChapterList(emu.grasscutter.net.proto.CoopChapterOuterClass.Co return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder addChapterList( int index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter value) { @@ -632,7 +632,7 @@ public Builder addChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder addChapterList( emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder builderForValue) { @@ -646,7 +646,7 @@ public Builder addChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder addChapterList( int index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder builderForValue) { @@ -660,7 +660,7 @@ public Builder addChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder addAllChapterList( java.lang.Iterable values) { @@ -675,7 +675,7 @@ public Builder addAllChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder clearChapterList() { if (chapterListBuilder_ == null) { @@ -688,7 +688,7 @@ public Builder clearChapterList() { return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public Builder removeChapterList(int index) { if (chapterListBuilder_ == null) { @@ -701,14 +701,14 @@ public Builder removeChapterList(int index) { return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder getChapterListBuilder( int index) { return getChapterListFieldBuilder().getBuilder(index); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getChapterListOrBuilder( int index) { @@ -718,7 +718,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getC } } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public java.util.List getChapterListOrBuilderList() { @@ -729,14 +729,14 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getC } } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder addChapterListBuilder() { return getChapterListFieldBuilder().addBuilder( emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.getDefaultInstance()); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder addChapterListBuilder( int index) { @@ -744,7 +744,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder addCh index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.getDefaultInstance()); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 14; */ public java.util.List getChapterListBuilderList() { @@ -833,7 +833,7 @@ public emu.grasscutter.net.proto.CoopChapterUpdateNotifyOuterClass.CoopChapterUp java.lang.String[] descriptorData = { "\n\035CoopChapterUpdateNotify.proto\032\021CoopCha" + "pter.proto\"=\n\027CoopChapterUpdateNotify\022\"\n" + - "\014chapter_list\030\001 \003(\0132\014.CoopChapterB\033\n\031emu" + + "\014chapter_list\030\016 \003(\0132\014.CoopChapterB\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CoopDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CoopDataNotifyOuterClass.java index a76fbbaba7d..3597d620cce 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CoopDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CoopDataNotifyOuterClass.java @@ -19,62 +19,62 @@ public interface CoopDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_have_progress = 7; + * bool is_have_progress = 3; * @return The isHaveProgress. */ boolean getIsHaveProgress(); /** - * repeated .CoopChapter chapter_list = 1; + * repeated uint32 viewed_chapter_list = 6; + * @return A list containing the viewedChapterList. + */ + java.util.List getViewedChapterListList(); + /** + * repeated uint32 viewed_chapter_list = 6; + * @return The count of viewedChapterList. + */ + int getViewedChapterListCount(); + /** + * repeated uint32 viewed_chapter_list = 6; + * @param index The index of the element to return. + * @return The viewedChapterList at the given index. + */ + int getViewedChapterList(int index); + + /** + * repeated .CoopChapter chapter_list = 8; */ java.util.List getChapterListList(); /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getChapterList(int index); /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ int getChapterListCount(); /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ java.util.List getChapterListOrBuilderList(); /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getChapterListOrBuilder( int index); /** - * uint32 cur_coop_point = 9; + * uint32 cur_coop_point = 15; * @return The curCoopPoint. */ int getCurCoopPoint(); - - /** - * repeated uint32 viewed_chapter_list = 8; - * @return A list containing the viewedChapterList. - */ - java.util.List getViewedChapterListList(); - /** - * repeated uint32 viewed_chapter_list = 8; - * @return The count of viewedChapterList. - */ - int getViewedChapterListCount(); - /** - * repeated uint32 viewed_chapter_list = 8; - * @param index The index of the element to return. - * @return The viewedChapterList at the given index. - */ - int getViewedChapterList(int index); } /** * 
-   * CmdId: 21157
-   * Obf: BAGILCCBHBF
+   * CmdId: 25237
+   * obf: GFEAHJACJIM
    *
* * Protobuf type {@code CoopDataNotify} @@ -89,8 +89,8 @@ private CoopDataNotify(com.google.protobuf.GeneratedMessageV3.Builder builder super(builder); } private CoopDataNotify() { - chapterList_ = java.util.Collections.emptyList(); viewedChapterList_ = emptyIntList(); + chapterList_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -124,34 +124,25 @@ private CoopDataNotify( case 0: done = true; break; - case 10: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - chapterList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - chapterList_.add( - input.readMessage(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.parser(), extensionRegistry)); - break; - } - case 56: { + case 24: { isHaveProgress_ = input.readBool(); break; } - case 64: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + case 48: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { viewedChapterList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } viewedChapterList_.addInt(input.readUInt32()); break; } - case 66: { + case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { viewedChapterList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { viewedChapterList_.addInt(input.readUInt32()); @@ -159,7 +150,16 @@ private CoopDataNotify( input.popLimit(limit); break; } - case 72: { + case 66: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + chapterList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + chapterList_.add( + input.readMessage(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.parser(), extensionRegistry)); + break; + } + case 120: { curCoopPoint_ = input.readUInt32(); break; @@ -180,10 +180,10 @@ private CoopDataNotify( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - chapterList_ = java.util.Collections.unmodifiableList(chapterList_); + viewedChapterList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { - viewedChapterList_.makeImmutable(); // C + chapterList_ = java.util.Collections.unmodifiableList(chapterList_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -202,10 +202,10 @@ private CoopDataNotify( emu.grasscutter.net.proto.CoopDataNotifyOuterClass.CoopDataNotify.class, emu.grasscutter.net.proto.CoopDataNotifyOuterClass.CoopDataNotify.Builder.class); } - public static final int IS_HAVE_PROGRESS_FIELD_NUMBER = 7; + public static final int IS_HAVE_PROGRESS_FIELD_NUMBER = 3; private boolean isHaveProgress_; /** - * bool is_have_progress = 7; + * bool is_have_progress = 3; * @return The isHaveProgress. */ @java.lang.Override @@ -213,17 +213,45 @@ public boolean getIsHaveProgress() { return isHaveProgress_; } - public static final int CHAPTER_LIST_FIELD_NUMBER = 1; + public static final int VIEWED_CHAPTER_LIST_FIELD_NUMBER = 6; + private com.google.protobuf.Internal.IntList viewedChapterList_; + /** + * repeated uint32 viewed_chapter_list = 6; + * @return A list containing the viewedChapterList. + */ + @java.lang.Override + public java.util.List + getViewedChapterListList() { + return viewedChapterList_; + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @return The count of viewedChapterList. + */ + public int getViewedChapterListCount() { + return viewedChapterList_.size(); + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @param index The index of the element to return. + * @return The viewedChapterList at the given index. + */ + public int getViewedChapterList(int index) { + return viewedChapterList_.getInt(index); + } + private int viewedChapterListMemoizedSerializedSize = -1; + + public static final int CHAPTER_LIST_FIELD_NUMBER = 8; private java.util.List chapterList_; /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ @java.lang.Override public java.util.List getChapterListList() { return chapterList_; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ @java.lang.Override public java.util.List @@ -231,21 +259,21 @@ public java.util.Listrepeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ @java.lang.Override public int getChapterListCount() { return chapterList_.size(); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getChapterList(int index) { return chapterList_.get(index); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getChapterListOrBuilder( @@ -253,10 +281,10 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getC return chapterList_.get(index); } - public static final int CUR_COOP_POINT_FIELD_NUMBER = 9; + public static final int CUR_COOP_POINT_FIELD_NUMBER = 15; private int curCoopPoint_; /** - * uint32 cur_coop_point = 9; + * uint32 cur_coop_point = 15; * @return The curCoopPoint. */ @java.lang.Override @@ -264,34 +292,6 @@ public int getCurCoopPoint() { return curCoopPoint_; } - public static final int VIEWED_CHAPTER_LIST_FIELD_NUMBER = 8; - private com.google.protobuf.Internal.IntList viewedChapterList_; - /** - * repeated uint32 viewed_chapter_list = 8; - * @return A list containing the viewedChapterList. - */ - @java.lang.Override - public java.util.List - getViewedChapterListList() { - return viewedChapterList_; - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @return The count of viewedChapterList. - */ - public int getViewedChapterListCount() { - return viewedChapterList_.size(); - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @param index The index of the element to return. - * @return The viewedChapterList at the given index. - */ - public int getViewedChapterList(int index) { - return viewedChapterList_.getInt(index); - } - private int viewedChapterListMemoizedSerializedSize = -1; - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -307,21 +307,21 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < chapterList_.size(); i++) { - output.writeMessage(1, chapterList_.get(i)); - } if (isHaveProgress_ != false) { - output.writeBool(7, isHaveProgress_); + output.writeBool(3, isHaveProgress_); } if (getViewedChapterListList().size() > 0) { - output.writeUInt32NoTag(66); + output.writeUInt32NoTag(50); output.writeUInt32NoTag(viewedChapterListMemoizedSerializedSize); } for (int i = 0; i < viewedChapterList_.size(); i++) { output.writeUInt32NoTag(viewedChapterList_.getInt(i)); } + for (int i = 0; i < chapterList_.size(); i++) { + output.writeMessage(8, chapterList_.get(i)); + } if (curCoopPoint_ != 0) { - output.writeUInt32(9, curCoopPoint_); + output.writeUInt32(15, curCoopPoint_); } unknownFields.writeTo(output); } @@ -332,13 +332,9 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < chapterList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, chapterList_.get(i)); - } if (isHaveProgress_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, isHaveProgress_); + .computeBoolSize(3, isHaveProgress_); } { int dataSize = 0; @@ -354,9 +350,13 @@ public int getSerializedSize() { } viewedChapterListMemoizedSerializedSize = dataSize; } + for (int i = 0; i < chapterList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, chapterList_.get(i)); + } if (curCoopPoint_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, curCoopPoint_); + .computeUInt32Size(15, curCoopPoint_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -375,12 +375,12 @@ public boolean equals(final java.lang.Object obj) { if (getIsHaveProgress() != other.getIsHaveProgress()) return false; + if (!getViewedChapterListList() + .equals(other.getViewedChapterListList())) return false; if (!getChapterListList() .equals(other.getChapterListList())) return false; if (getCurCoopPoint() != other.getCurCoopPoint()) return false; - if (!getViewedChapterListList() - .equals(other.getViewedChapterListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -395,16 +395,16 @@ public int hashCode() { hash = (37 * hash) + IS_HAVE_PROGRESS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsHaveProgress()); + if (getViewedChapterListCount() > 0) { + hash = (37 * hash) + VIEWED_CHAPTER_LIST_FIELD_NUMBER; + hash = (53 * hash) + getViewedChapterListList().hashCode(); + } if (getChapterListCount() > 0) { hash = (37 * hash) + CHAPTER_LIST_FIELD_NUMBER; hash = (53 * hash) + getChapterListList().hashCode(); } hash = (37 * hash) + CUR_COOP_POINT_FIELD_NUMBER; hash = (53 * hash) + getCurCoopPoint(); - if (getViewedChapterListCount() > 0) { - hash = (37 * hash) + VIEWED_CHAPTER_LIST_FIELD_NUMBER; - hash = (53 * hash) + getViewedChapterListList().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -502,8 +502,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 21157
-     * Obf: BAGILCCBHBF
+     * CmdId: 25237
+     * obf: GFEAHJACJIM
      *
* * Protobuf type {@code CoopDataNotify} @@ -546,16 +546,16 @@ public Builder clear() { super.clear(); isHaveProgress_ = false; + viewedChapterList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); if (chapterListBuilder_ == null) { chapterList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { chapterListBuilder_.clear(); } curCoopPoint_ = 0; - viewedChapterList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -584,21 +584,21 @@ public emu.grasscutter.net.proto.CoopDataNotifyOuterClass.CoopDataNotify buildPa emu.grasscutter.net.proto.CoopDataNotifyOuterClass.CoopDataNotify result = new emu.grasscutter.net.proto.CoopDataNotifyOuterClass.CoopDataNotify(this); int from_bitField0_ = bitField0_; result.isHaveProgress_ = isHaveProgress_; + if (((bitField0_ & 0x00000001) != 0)) { + viewedChapterList_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.viewedChapterList_ = viewedChapterList_; if (chapterListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { chapterList_ = java.util.Collections.unmodifiableList(chapterList_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.chapterList_ = chapterList_; } else { result.chapterList_ = chapterListBuilder_.build(); } result.curCoopPoint_ = curCoopPoint_; - if (((bitField0_ & 0x00000002) != 0)) { - viewedChapterList_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.viewedChapterList_ = viewedChapterList_; onBuilt(); return result; } @@ -650,11 +650,21 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CoopDataNotifyOuterClass.Coop if (other.getIsHaveProgress() != false) { setIsHaveProgress(other.getIsHaveProgress()); } + if (!other.viewedChapterList_.isEmpty()) { + if (viewedChapterList_.isEmpty()) { + viewedChapterList_ = other.viewedChapterList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureViewedChapterListIsMutable(); + viewedChapterList_.addAll(other.viewedChapterList_); + } + onChanged(); + } if (chapterListBuilder_ == null) { if (!other.chapterList_.isEmpty()) { if (chapterList_.isEmpty()) { chapterList_ = other.chapterList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureChapterListIsMutable(); chapterList_.addAll(other.chapterList_); @@ -667,7 +677,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CoopDataNotifyOuterClass.Coop chapterListBuilder_.dispose(); chapterListBuilder_ = null; chapterList_ = other.chapterList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); chapterListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getChapterListFieldBuilder() : null; @@ -679,16 +689,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CoopDataNotifyOuterClass.Coop if (other.getCurCoopPoint() != 0) { setCurCoopPoint(other.getCurCoopPoint()); } - if (!other.viewedChapterList_.isEmpty()) { - if (viewedChapterList_.isEmpty()) { - viewedChapterList_ = other.viewedChapterList_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureViewedChapterListIsMutable(); - viewedChapterList_.addAll(other.viewedChapterList_); - } - onChanged(); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -721,7 +721,7 @@ public Builder mergeFrom( private boolean isHaveProgress_ ; /** - * bool is_have_progress = 7; + * bool is_have_progress = 3; * @return The isHaveProgress. */ @java.lang.Override @@ -729,7 +729,7 @@ public boolean getIsHaveProgress() { return isHaveProgress_; } /** - * bool is_have_progress = 7; + * bool is_have_progress = 3; * @param value The isHaveProgress to set. * @return This builder for chaining. */ @@ -740,7 +740,7 @@ public Builder setIsHaveProgress(boolean value) { return this; } /** - * bool is_have_progress = 7; + * bool is_have_progress = 3; * @return This builder for chaining. */ public Builder clearIsHaveProgress() { @@ -750,12 +750,91 @@ public Builder clearIsHaveProgress() { return this; } + private com.google.protobuf.Internal.IntList viewedChapterList_ = emptyIntList(); + private void ensureViewedChapterListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + viewedChapterList_ = mutableCopy(viewedChapterList_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @return A list containing the viewedChapterList. + */ + public java.util.List + getViewedChapterListList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(viewedChapterList_) : viewedChapterList_; + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @return The count of viewedChapterList. + */ + public int getViewedChapterListCount() { + return viewedChapterList_.size(); + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @param index The index of the element to return. + * @return The viewedChapterList at the given index. + */ + public int getViewedChapterList(int index) { + return viewedChapterList_.getInt(index); + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @param index The index to set the value at. + * @param value The viewedChapterList to set. + * @return This builder for chaining. + */ + public Builder setViewedChapterList( + int index, int value) { + ensureViewedChapterListIsMutable(); + viewedChapterList_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @param value The viewedChapterList to add. + * @return This builder for chaining. + */ + public Builder addViewedChapterList(int value) { + ensureViewedChapterListIsMutable(); + viewedChapterList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @param values The viewedChapterList to add. + * @return This builder for chaining. + */ + public Builder addAllViewedChapterList( + java.lang.Iterable values) { + ensureViewedChapterListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, viewedChapterList_); + onChanged(); + return this; + } + /** + * repeated uint32 viewed_chapter_list = 6; + * @return This builder for chaining. + */ + public Builder clearViewedChapterList() { + viewedChapterList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + private java.util.List chapterList_ = java.util.Collections.emptyList(); private void ensureChapterListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { chapterList_ = new java.util.ArrayList(chapterList_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -763,7 +842,7 @@ private void ensureChapterListIsMutable() { emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder> chapterListBuilder_; /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public java.util.List getChapterListList() { if (chapterListBuilder_ == null) { @@ -773,7 +852,7 @@ public java.util.Listrepeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public int getChapterListCount() { if (chapterListBuilder_ == null) { @@ -783,7 +862,7 @@ public int getChapterListCount() { } } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getChapterList(int index) { if (chapterListBuilder_ == null) { @@ -793,7 +872,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter getChapterLis } } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder setChapterList( int index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter value) { @@ -810,7 +889,7 @@ public Builder setChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder setChapterList( int index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder builderForValue) { @@ -824,7 +903,7 @@ public Builder setChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder addChapterList(emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter value) { if (chapterListBuilder_ == null) { @@ -840,7 +919,7 @@ public Builder addChapterList(emu.grasscutter.net.proto.CoopChapterOuterClass.Co return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder addChapterList( int index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter value) { @@ -857,7 +936,7 @@ public Builder addChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder addChapterList( emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder builderForValue) { @@ -871,7 +950,7 @@ public Builder addChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder addChapterList( int index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder builderForValue) { @@ -885,7 +964,7 @@ public Builder addChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder addAllChapterList( java.lang.Iterable values) { @@ -900,12 +979,12 @@ public Builder addAllChapterList( return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder clearChapterList() { if (chapterListBuilder_ == null) { chapterList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { chapterListBuilder_.clear(); @@ -913,7 +992,7 @@ public Builder clearChapterList() { return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public Builder removeChapterList(int index) { if (chapterListBuilder_ == null) { @@ -926,14 +1005,14 @@ public Builder removeChapterList(int index) { return this; } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder getChapterListBuilder( int index) { return getChapterListFieldBuilder().getBuilder(index); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getChapterListOrBuilder( int index) { @@ -943,7 +1022,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getC } } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public java.util.List getChapterListOrBuilderList() { @@ -954,14 +1033,14 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder getC } } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder addChapterListBuilder() { return getChapterListFieldBuilder().addBuilder( emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.getDefaultInstance()); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder addChapterListBuilder( int index) { @@ -969,7 +1048,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder addCh index, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.getDefaultInstance()); } /** - * repeated .CoopChapter chapter_list = 1; + * repeated .CoopChapter chapter_list = 8; */ public java.util.List getChapterListBuilderList() { @@ -982,7 +1061,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder addCh chapterListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder, emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapterOrBuilder>( chapterList_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); chapterList_ = null; @@ -992,7 +1071,7 @@ public emu.grasscutter.net.proto.CoopChapterOuterClass.CoopChapter.Builder addCh private int curCoopPoint_ ; /** - * uint32 cur_coop_point = 9; + * uint32 cur_coop_point = 15; * @return The curCoopPoint. */ @java.lang.Override @@ -1000,7 +1079,7 @@ public int getCurCoopPoint() { return curCoopPoint_; } /** - * uint32 cur_coop_point = 9; + * uint32 cur_coop_point = 15; * @param value The curCoopPoint to set. * @return This builder for chaining. */ @@ -1011,7 +1090,7 @@ public Builder setCurCoopPoint(int value) { return this; } /** - * uint32 cur_coop_point = 9; + * uint32 cur_coop_point = 15; * @return This builder for chaining. */ public Builder clearCurCoopPoint() { @@ -1020,85 +1099,6 @@ public Builder clearCurCoopPoint() { onChanged(); return this; } - - private com.google.protobuf.Internal.IntList viewedChapterList_ = emptyIntList(); - private void ensureViewedChapterListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - viewedChapterList_ = mutableCopy(viewedChapterList_); - bitField0_ |= 0x00000002; - } - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @return A list containing the viewedChapterList. - */ - public java.util.List - getViewedChapterListList() { - return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(viewedChapterList_) : viewedChapterList_; - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @return The count of viewedChapterList. - */ - public int getViewedChapterListCount() { - return viewedChapterList_.size(); - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @param index The index of the element to return. - * @return The viewedChapterList at the given index. - */ - public int getViewedChapterList(int index) { - return viewedChapterList_.getInt(index); - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @param index The index to set the value at. - * @param value The viewedChapterList to set. - * @return This builder for chaining. - */ - public Builder setViewedChapterList( - int index, int value) { - ensureViewedChapterListIsMutable(); - viewedChapterList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @param value The viewedChapterList to add. - * @return This builder for chaining. - */ - public Builder addViewedChapterList(int value) { - ensureViewedChapterListIsMutable(); - viewedChapterList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @param values The viewedChapterList to add. - * @return This builder for chaining. - */ - public Builder addAllViewedChapterList( - java.lang.Iterable values) { - ensureViewedChapterListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, viewedChapterList_); - onChanged(); - return this; - } - /** - * repeated uint32 viewed_chapter_list = 8; - * @return This builder for chaining. - */ - public Builder clearViewedChapterList() { - viewedChapterList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1168,9 +1168,9 @@ public emu.grasscutter.net.proto.CoopDataNotifyOuterClass.CoopDataNotify getDefa java.lang.String[] descriptorData = { "\n\024CoopDataNotify.proto\032\021CoopChapter.prot" + "o\"\203\001\n\016CoopDataNotify\022\030\n\020is_have_progress" + - "\030\007 \001(\010\022\"\n\014chapter_list\030\001 \003(\0132\014.CoopChapt" + - "er\022\026\n\016cur_coop_point\030\t \001(\r\022\033\n\023viewed_cha" + - "pter_list\030\010 \003(\rB\033\n\031emu.grasscutter.net.p" + + "\030\003 \001(\010\022\033\n\023viewed_chapter_list\030\006 \003(\r\022\"\n\014c" + + "hapter_list\030\010 \003(\0132\014.CoopChapter\022\026\n\016cur_c" + + "oop_point\030\017 \001(\rB\033\n\031emu.grasscutter.net.p" + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1183,7 +1183,7 @@ public emu.grasscutter.net.proto.CoopDataNotifyOuterClass.CoopDataNotify getDefa internal_static_CoopDataNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CoopDataNotify_descriptor, - new java.lang.String[] { "IsHaveProgress", "ChapterList", "CurCoopPoint", "ViewedChapterList", }); + new java.lang.String[] { "IsHaveProgress", "ViewedChapterList", "ChapterList", "CurCoopPoint", }); emu.grasscutter.net.proto.CoopChapterOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CoopPointOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CoopPointOuterClass.java index 2ce07da2082..c0bdaa9c6da 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CoopPointOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CoopPointOuterClass.java @@ -19,31 +19,31 @@ public interface CoopPointOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 id = 8; - * @return The id. - */ - int getId(); - - /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @return The enum numeric value on the wire for state. */ int getStateValue(); /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @return The state. */ emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State getState(); /** - * uint32 self_confidence = 10; + * uint32 self_confidence = 11; * @return The selfConfidence. */ int getSelfConfidence(); + + /** + * uint32 id = 15; + * @return The id. + */ + int getId(); } /** * 
-   * Obf: JCOLKMKHPFO
+   * obf: AKOGEOGFLLK
    *
* * Protobuf type {@code CoopPoint} @@ -92,19 +92,19 @@ private CoopPoint( done = true; break; case 64: { + int rawValue = input.readEnum(); - id_ = input.readUInt32(); + state_ = rawValue; break; } - case 80: { + case 88: { selfConfidence_ = input.readUInt32(); break; } - case 112: { - int rawValue = input.readEnum(); + case 120: { - state_ = rawValue; + id_ = input.readUInt32(); break; } default: { @@ -141,7 +141,7 @@ private CoopPoint( /** * 
-     * Obf: JOFAANNBAFC
+     * obf: HPICHAILNKA
      *
* * Protobuf enum {@code CoopPoint.State} @@ -149,32 +149,32 @@ private CoopPoint( public enum State implements com.google.protobuf.ProtocolMessageEnum { /** - * STATE_UNSTARTED = 0; + * UNSTARTED = 0; */ - STATE_UNSTARTED(0), + UNSTARTED(0), /** - * STATE_STARTED = 1; + * STARTED = 1; */ - STATE_STARTED(1), + STARTED(1), /** - * STATE_FINISHED = 2; + * FINISHED = 2; */ - STATE_FINISHED(2), + FINISHED(2), UNRECOGNIZED(-1), ; /** - * STATE_UNSTARTED = 0; + * UNSTARTED = 0; */ - public static final int STATE_UNSTARTED_VALUE = 0; + public static final int UNSTARTED_VALUE = 0; /** - * STATE_STARTED = 1; + * STARTED = 1; */ - public static final int STATE_STARTED_VALUE = 1; + public static final int STARTED_VALUE = 1; /** - * STATE_FINISHED = 2; + * FINISHED = 2; */ - public static final int STATE_FINISHED_VALUE = 2; + public static final int FINISHED_VALUE = 2; public final int getNumber() { @@ -201,9 +201,9 @@ public static State valueOf(int value) { */ public static State forNumber(int value) { switch (value) { - case 0: return STATE_UNSTARTED; - case 1: return STATE_STARTED; - case 2: return STATE_FINISHED; + case 0: return UNSTARTED; + case 1: return STARTED; + case 2: return FINISHED; default: return null; } } @@ -260,28 +260,17 @@ private State(int value) { // @@protoc_insertion_point(enum_scope:CoopPoint.State) } - public static final int ID_FIELD_NUMBER = 8; - private int id_; - /** - * uint32 id = 8; - * @return The id. - */ - @java.lang.Override - public int getId() { - return id_; - } - - public static final int STATE_FIELD_NUMBER = 14; + public static final int STATE_FIELD_NUMBER = 8; private int state_; /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @return The enum numeric value on the wire for state. */ @java.lang.Override public int getStateValue() { return state_; } /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @return The state. */ @java.lang.Override public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State getState() { @@ -290,10 +279,10 @@ public int getId() { return result == null ? emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.UNRECOGNIZED : result; } - public static final int SELF_CONFIDENCE_FIELD_NUMBER = 10; + public static final int SELF_CONFIDENCE_FIELD_NUMBER = 11; private int selfConfidence_; /** - * uint32 self_confidence = 10; + * uint32 self_confidence = 11; * @return The selfConfidence. */ @java.lang.Override @@ -301,6 +290,17 @@ public int getSelfConfidence() { return selfConfidence_; } + public static final int ID_FIELD_NUMBER = 15; + private int id_; + /** + * uint32 id = 15; + * @return The id. + */ + @java.lang.Override + public int getId() { + return id_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -315,14 +315,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (id_ != 0) { - output.writeUInt32(8, id_); + if (state_ != emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.UNSTARTED.getNumber()) { + output.writeEnum(8, state_); } if (selfConfidence_ != 0) { - output.writeUInt32(10, selfConfidence_); + output.writeUInt32(11, selfConfidence_); } - if (state_ != emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.STATE_UNSTARTED.getNumber()) { - output.writeEnum(14, state_); + if (id_ != 0) { + output.writeUInt32(15, id_); } unknownFields.writeTo(output); } @@ -333,17 +333,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (id_ != 0) { + if (state_ != emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.UNSTARTED.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, id_); + .computeEnumSize(8, state_); } if (selfConfidence_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, selfConfidence_); + .computeUInt32Size(11, selfConfidence_); } - if (state_ != emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.STATE_UNSTARTED.getNumber()) { + if (id_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(14, state_); + .computeUInt32Size(15, id_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -360,11 +360,11 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint other = (emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint) obj; - if (getId() - != other.getId()) return false; if (state_ != other.state_) return false; if (getSelfConfidence() != other.getSelfConfidence()) return false; + if (getId() + != other.getId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -376,12 +376,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId(); hash = (37 * hash) + STATE_FIELD_NUMBER; hash = (53 * hash) + state_; hash = (37 * hash) + SELF_CONFIDENCE_FIELD_NUMBER; hash = (53 * hash) + getSelfConfidence(); + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -479,7 +479,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: JCOLKMKHPFO
+     * obf: AKOGEOGFLLK
      *
* * Protobuf type {@code CoopPoint} @@ -519,12 +519,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - id_ = 0; - state_ = 0; selfConfidence_ = 0; + id_ = 0; + return this; } @@ -551,9 +551,9 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint build() { @java.lang.Override public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint buildPartial() { emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint result = new emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint(this); - result.id_ = id_; result.state_ = state_; result.selfConfidence_ = selfConfidence_; + result.id_ = id_; onBuilt(); return result; } @@ -602,15 +602,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint other) { if (other == emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.getDefaultInstance()) return this; - if (other.getId() != 0) { - setId(other.getId()); - } if (other.state_ != 0) { setStateValue(other.getStateValue()); } if (other.getSelfConfidence() != 0) { setSelfConfidence(other.getSelfConfidence()); } + if (other.getId() != 0) { + setId(other.getId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -640,47 +640,16 @@ public Builder mergeFrom( return this; } - private int id_ ; - /** - * uint32 id = 8; - * @return The id. - */ - @java.lang.Override - public int getId() { - return id_; - } - /** - * uint32 id = 8; - * @param value The id to set. - * @return This builder for chaining. - */ - public Builder setId(int value) { - - id_ = value; - onChanged(); - return this; - } - /** - * uint32 id = 8; - * @return This builder for chaining. - */ - public Builder clearId() { - - id_ = 0; - onChanged(); - return this; - } - private int state_ = 0; /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @return The enum numeric value on the wire for state. */ @java.lang.Override public int getStateValue() { return state_; } /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @param value The enum numeric value on the wire for state to set. * @return This builder for chaining. */ @@ -691,7 +660,7 @@ public Builder setStateValue(int value) { return this; } /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @return The state. */ @java.lang.Override @@ -701,7 +670,7 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State getState() return result == null ? emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint.State.UNRECOGNIZED : result; } /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @param value The state to set. * @return This builder for chaining. */ @@ -715,7 +684,7 @@ public Builder setState(emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint. return this; } /** - * .CoopPoint.State state = 14; + * .CoopPoint.State state = 8; * @return This builder for chaining. */ public Builder clearState() { @@ -727,7 +696,7 @@ public Builder clearState() { private int selfConfidence_ ; /** - * uint32 self_confidence = 10; + * uint32 self_confidence = 11; * @return The selfConfidence. */ @java.lang.Override @@ -735,7 +704,7 @@ public int getSelfConfidence() { return selfConfidence_; } /** - * uint32 self_confidence = 10; + * uint32 self_confidence = 11; * @param value The selfConfidence to set. * @return This builder for chaining. */ @@ -746,7 +715,7 @@ public Builder setSelfConfidence(int value) { return this; } /** - * uint32 self_confidence = 10; + * uint32 self_confidence = 11; * @return This builder for chaining. */ public Builder clearSelfConfidence() { @@ -755,6 +724,37 @@ public Builder clearSelfConfidence() { onChanged(); return this; } + + private int id_ ; + /** + * uint32 id = 15; + * @return The id. + */ + @java.lang.Override + public int getId() { + return id_; + } + /** + * uint32 id = 15; + * @param value The id to set. + * @return This builder for chaining. + */ + public Builder setId(int value) { + + id_ = value; + onChanged(); + return this; + } + /** + * uint32 id = 15; + * @return This builder for chaining. + */ + public Builder clearId() { + + id_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -822,12 +822,11 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint getDefaultInstanc descriptor; static { java.lang.String[] descriptorData = { - "\n\017CoopPoint.proto\"\226\001\n\tCoopPoint\022\n\n\002id\030\010 " + - "\001(\r\022\037\n\005state\030\016 \001(\0162\020.CoopPoint.State\022\027\n\017" + - "self_confidence\030\n \001(\r\"C\n\005State\022\023\n\017STATE_" + - "UNSTARTED\020\000\022\021\n\rSTATE_STARTED\020\001\022\022\n\016STATE_" + - "FINISHED\020\002B\033\n\031emu.grasscutter.net.protob" + - "\006proto3" + "\n\017CoopPoint.proto\"\204\001\n\tCoopPoint\022\037\n\005state" + + "\030\010 \001(\0162\020.CoopPoint.State\022\027\n\017self_confide" + + "nce\030\013 \001(\r\022\n\n\002id\030\017 \001(\r\"1\n\005State\022\r\n\tUNSTAR" + + "TED\020\000\022\013\n\007STARTED\020\001\022\014\n\010FINISHED\020\002B\033\n\031emu." + + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -838,7 +837,7 @@ public emu.grasscutter.net.proto.CoopPointOuterClass.CoopPoint getDefaultInstanc internal_static_CoopPoint_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CoopPoint_descriptor, - new java.lang.String[] { "Id", "State", "SelfConfidence", }); + new java.lang.String[] { "State", "SelfConfidence", "Id", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CoopRewardOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CoopRewardOuterClass.java index 3155188122e..73f55ae7661 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CoopRewardOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CoopRewardOuterClass.java @@ -19,25 +19,25 @@ public interface CoopRewardOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 id = 2; + * uint32 id = 3; * @return The id. */ int getId(); /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @return The enum numeric value on the wire for state. */ int getStateValue(); /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @return The state. */ emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.State getState(); } /** * 
-   * Obf: PCNHBJPDMOB
+   * obf: NBHMAICJJPO
    *
* * Protobuf type {@code CoopReward} @@ -85,12 +85,12 @@ private CoopReward( case 0: done = true; break; - case 16: { + case 24: { id_ = input.readUInt32(); break; } - case 80: { + case 96: { int rawValue = input.readEnum(); state_ = rawValue; @@ -130,7 +130,7 @@ private CoopReward( /** * 
-     * Obf: NNDLFEMBJMK
+     * obf: BDKPPLLIBFF
      *
* * Protobuf enum {@code CoopReward.State} @@ -138,32 +138,32 @@ private CoopReward( public enum State implements com.google.protobuf.ProtocolMessageEnum { /** - * STATE_UNLOCK = 0; + * UNLOCK = 0; */ - STATE_UNLOCK(0), + UNLOCK(0), /** - * STATE_LOCK = 1; + * LOCK = 1; */ - STATE_LOCK(1), + LOCK(1), /** - * STATE_TAKEN = 2; + * TAKEN = 2; */ - STATE_TAKEN(2), + TAKEN(2), UNRECOGNIZED(-1), ; /** - * STATE_UNLOCK = 0; + * UNLOCK = 0; */ - public static final int STATE_UNLOCK_VALUE = 0; + public static final int UNLOCK_VALUE = 0; /** - * STATE_LOCK = 1; + * LOCK = 1; */ - public static final int STATE_LOCK_VALUE = 1; + public static final int LOCK_VALUE = 1; /** - * STATE_TAKEN = 2; + * TAKEN = 2; */ - public static final int STATE_TAKEN_VALUE = 2; + public static final int TAKEN_VALUE = 2; public final int getNumber() { @@ -190,9 +190,9 @@ public static State valueOf(int value) { */ public static State forNumber(int value) { switch (value) { - case 0: return STATE_UNLOCK; - case 1: return STATE_LOCK; - case 2: return STATE_TAKEN; + case 0: return UNLOCK; + case 1: return LOCK; + case 2: return TAKEN; default: return null; } } @@ -249,10 +249,10 @@ private State(int value) { // @@protoc_insertion_point(enum_scope:CoopReward.State) } - public static final int ID_FIELD_NUMBER = 2; + public static final int ID_FIELD_NUMBER = 3; private int id_; /** - * uint32 id = 2; + * uint32 id = 3; * @return The id. */ @java.lang.Override @@ -260,17 +260,17 @@ public int getId() { return id_; } - public static final int STATE_FIELD_NUMBER = 10; + public static final int STATE_FIELD_NUMBER = 12; private int state_; /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @return The enum numeric value on the wire for state. */ @java.lang.Override public int getStateValue() { return state_; } /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @return The state. */ @java.lang.Override public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.State getState() { @@ -294,10 +294,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (id_ != 0) { - output.writeUInt32(2, id_); + output.writeUInt32(3, id_); } - if (state_ != emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.State.STATE_UNLOCK.getNumber()) { - output.writeEnum(10, state_); + if (state_ != emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.State.UNLOCK.getNumber()) { + output.writeEnum(12, state_); } unknownFields.writeTo(output); } @@ -310,11 +310,11 @@ public int getSerializedSize() { size = 0; if (id_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, id_); + .computeUInt32Size(3, id_); } - if (state_ != emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.State.STATE_UNLOCK.getNumber()) { + if (state_ != emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.State.UNLOCK.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(10, state_); + .computeEnumSize(12, state_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -446,7 +446,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: PCNHBJPDMOB
+     * obf: NBHMAICJJPO
      *
* * Protobuf type {@code CoopReward} @@ -603,7 +603,7 @@ public Builder mergeFrom( private int id_ ; /** - * uint32 id = 2; + * uint32 id = 3; * @return The id. */ @java.lang.Override @@ -611,7 +611,7 @@ public int getId() { return id_; } /** - * uint32 id = 2; + * uint32 id = 3; * @param value The id to set. * @return This builder for chaining. */ @@ -622,7 +622,7 @@ public Builder setId(int value) { return this; } /** - * uint32 id = 2; + * uint32 id = 3; * @return This builder for chaining. */ public Builder clearId() { @@ -634,14 +634,14 @@ public Builder clearId() { private int state_ = 0; /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @return The enum numeric value on the wire for state. */ @java.lang.Override public int getStateValue() { return state_; } /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @param value The enum numeric value on the wire for state to set. * @return This builder for chaining. */ @@ -652,7 +652,7 @@ public Builder setStateValue(int value) { return this; } /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @return The state. */ @java.lang.Override @@ -662,7 +662,7 @@ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.State getState( return result == null ? emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward.State.UNRECOGNIZED : result; } /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @param value The state to set. * @return This builder for chaining. */ @@ -676,7 +676,7 @@ public Builder setState(emu.grasscutter.net.proto.CoopRewardOuterClass.CoopRewar return this; } /** - * .CoopReward.State state = 10; + * .CoopReward.State state = 12; * @return This builder for chaining. */ public Builder clearState() { @@ -752,11 +752,10 @@ public emu.grasscutter.net.proto.CoopRewardOuterClass.CoopReward getDefaultInsta descriptor; static { java.lang.String[] descriptorData = { - "\n\020CoopReward.proto\"v\n\nCoopReward\022\n\n\002id\030\002" + - " \001(\r\022 \n\005state\030\n \001(\0162\021.CoopReward.State\":" + - "\n\005State\022\020\n\014STATE_UNLOCK\020\000\022\016\n\nSTATE_LOCK\020" + - "\001\022\017\n\013STATE_TAKEN\020\002B\033\n\031emu.grasscutter.ne" + - "t.protob\006proto3" + "\n\020CoopReward.proto\"d\n\nCoopReward\022\n\n\002id\030\003" + + " \001(\r\022 \n\005state\030\014 \001(\0162\021.CoopReward.State\"(" + + "\n\005State\022\n\n\006UNLOCK\020\000\022\010\n\004LOCK\020\001\022\t\n\005TAKEN\020\002" + + "B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CreateEntityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CreateEntityInfoOuterClass.java index 15e1e31784e..5b4fea82314 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CreateEntityInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CreateEntityInfoOuterClass.java @@ -117,25 +117,27 @@ public interface CreateEntityInfoOrBuilder extends int getItemId(); /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; * @return Whether the gadget field is set. */ boolean hasGadget(); /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; * @return The gadget. */ emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo getGadget(); /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder getGadgetOrBuilder(); public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.EntityCase getEntityCase(); - - public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.EntityCreateInfoCase getEntityCreateInfoCase(); } /** + * 
+   * 5.0
+   *
+ * * Protobuf type {@code CreateEntityInfo} */ public static final class CreateEntityInfo extends @@ -170,6 +172,7 @@ private CreateEntityInfo( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -248,16 +251,15 @@ private CreateEntityInfo( } case 106: { emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder subBuilder = null; - if (entityCreateInfoCase_ == 13) { - subBuilder = ((emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_).toBuilder(); + if (((bitField0_ & 0x00000001) != 0)) { + subBuilder = gadget_.toBuilder(); } - entityCreateInfo_ = - input.readMessage(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.parser(), extensionRegistry); + gadget_ = input.readMessage(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom((emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_); - entityCreateInfo_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(gadget_); + gadget_ = subBuilder.buildPartial(); } - entityCreateInfoCase_ = 13; + bitField0_ |= 0x00000001; break; } default: { @@ -292,6 +294,7 @@ private CreateEntityInfo( emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.class, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder.class); } + private int bitField0_; private int entityCase_ = 0; private java.lang.Object entity_; public enum EntityCase @@ -337,45 +340,6 @@ public int getNumber() { entityCase_); } - private int entityCreateInfoCase_ = 0; - private java.lang.Object entityCreateInfo_; - public enum EntityCreateInfoCase - implements com.google.protobuf.Internal.EnumLite, - com.google.protobuf.AbstractMessage.InternalOneOfEnum { - GADGET(13), - ENTITYCREATEINFO_NOT_SET(0); - private final int value; - private EntityCreateInfoCase(int value) { - this.value = value; - } - /** - * @param value The number of the enum to look for. - * @return The enum associated with the given number. - * @deprecated Use {@link #forNumber(int)} instead. - */ - @java.lang.Deprecated - public static EntityCreateInfoCase valueOf(int value) { - return forNumber(value); - } - - public static EntityCreateInfoCase forNumber(int value) { - switch (value) { - case 13: return GADGET; - case 0: return ENTITYCREATEINFO_NOT_SET; - default: return null; - } - } - public int getNumber() { - return this.value; - } - }; - - public EntityCreateInfoCase - getEntityCreateInfoCase() { - return EntityCreateInfoCase.forNumber( - entityCreateInfoCase_); - } - public static final int LEVEL_FIELD_NUMBER = 5; private int level_; /** @@ -557,34 +521,29 @@ public int getItemId() { } public static final int GADGET_FIELD_NUMBER = 13; + private emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo gadget_; /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; * @return Whether the gadget field is set. */ @java.lang.Override public boolean hasGadget() { - return entityCreateInfoCase_ == 13; + return ((bitField0_ & 0x00000001) != 0); } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; * @return The gadget. */ @java.lang.Override public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo getGadget() { - if (entityCreateInfoCase_ == 13) { - return (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_; - } - return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance(); + return gadget_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance() : gadget_; } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ @java.lang.Override public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder getGadgetOrBuilder() { - if (entityCreateInfoCase_ == 13) { - return (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_; - } - return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance(); + return gadget_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance() : gadget_; } private byte memoizedIsInitialized = -1; @@ -635,8 +594,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (clientUniqueId_ != 0) { output.writeUInt32(12, clientUniqueId_); } - if (entityCreateInfoCase_ == 13) { - output.writeMessage(13, (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_); + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(13, getGadget()); } unknownFields.writeTo(output); } @@ -691,9 +650,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(12, clientUniqueId_); } - if (entityCreateInfoCase_ == 13) { + if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_); + .computeMessageSize(13, getGadget()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -728,6 +687,11 @@ public boolean equals(final java.lang.Object obj) { != other.getRoomId()) return false; if (getClientUniqueId() != other.getClientUniqueId()) return false; + if (hasGadget() != other.hasGadget()) return false; + if (hasGadget()) { + if (!getGadget() + .equals(other.getGadget())) return false; + } if (!getEntityCase().equals(other.getEntityCase())) return false; switch (entityCase_) { case 1: @@ -749,15 +713,6 @@ public boolean equals(final java.lang.Object obj) { case 0: default: } - if (!getEntityCreateInfoCase().equals(other.getEntityCreateInfoCase())) return false; - switch (entityCreateInfoCase_) { - case 13: - if (!getGadget() - .equals(other.getGadget())) return false; - break; - case 0: - default: - } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -785,6 +740,10 @@ public int hashCode() { hash = (53 * hash) + getRoomId(); hash = (37 * hash) + CLIENT_UNIQUE_ID_FIELD_NUMBER; hash = (53 * hash) + getClientUniqueId(); + if (hasGadget()) { + hash = (37 * hash) + GADGET_FIELD_NUMBER; + hash = (53 * hash) + getGadget().hashCode(); + } switch (entityCase_) { case 1: hash = (37 * hash) + MONSTER_ID_FIELD_NUMBER; @@ -805,14 +764,6 @@ public int hashCode() { case 0: default: } - switch (entityCreateInfoCase_) { - case 13: - hash = (37 * hash) + GADGET_FIELD_NUMBER; - hash = (53 * hash) + getGadget().hashCode(); - break; - case 0: - default: - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -909,6 +860,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * 5.0
+     *
+ * * Protobuf type {@code CreateEntityInfo} */ public static final class Builder extends @@ -941,6 +896,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getGadgetFieldBuilder(); } } @java.lang.Override @@ -966,10 +922,14 @@ public Builder clear() { clientUniqueId_ = 0; + if (gadgetBuilder_ == null) { + gadget_ = null; + } else { + gadgetBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); entityCase_ = 0; entity_ = null; - entityCreateInfoCase_ = 0; - entityCreateInfo_ = null; return this; } @@ -996,6 +956,8 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo bui @java.lang.Override public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo buildPartial() { emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo result = new emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; result.level_ = level_; if (posBuilder_ == null) { result.pos_ = pos_; @@ -1022,15 +984,16 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo bui if (entityCase_ == 4) { result.entity_ = entity_; } - if (entityCreateInfoCase_ == 13) { + if (((from_bitField0_ & 0x00000001) != 0)) { if (gadgetBuilder_ == null) { - result.entityCreateInfo_ = entityCreateInfo_; + result.gadget_ = gadget_; } else { - result.entityCreateInfo_ = gadgetBuilder_.build(); + result.gadget_ = gadgetBuilder_.build(); } + to_bitField0_ |= 0x00000001; } + result.bitField0_ = to_bitField0_; result.entityCase_ = entityCase_; - result.entityCreateInfoCase_ = entityCreateInfoCase_; onBuilt(); return result; } @@ -1097,6 +1060,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.Cr if (other.getClientUniqueId() != 0) { setClientUniqueId(other.getClientUniqueId()); } + if (other.hasGadget()) { + mergeGadget(other.getGadget()); + } switch (other.getEntityCase()) { case MONSTER_ID: { setMonsterId(other.getMonsterId()); @@ -1118,15 +1084,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.Cr break; } } - switch (other.getEntityCreateInfoCase()) { - case GADGET: { - mergeGadget(other.getGadget()); - break; - } - case ENTITYCREATEINFO_NOT_SET: { - break; - } - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1170,21 +1127,7 @@ public Builder clearEntity() { return this; } - private int entityCreateInfoCase_ = 0; - private java.lang.Object entityCreateInfo_; - public EntityCreateInfoCase - getEntityCreateInfoCase() { - return EntityCreateInfoCase.forNumber( - entityCreateInfoCase_); - } - - public Builder clearEntityCreateInfo() { - entityCreateInfoCase_ = 0; - entityCreateInfo_ = null; - onChanged(); - return this; - } - + private int bitField0_; private int level_ ; /** @@ -1712,144 +1655,123 @@ public Builder clearItemId() { return this; } + private emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo gadget_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder> gadgetBuilder_; /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; * @return Whether the gadget field is set. */ - @java.lang.Override public boolean hasGadget() { - return entityCreateInfoCase_ == 13; + return ((bitField0_ & 0x00000001) != 0); } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; * @return The gadget. */ - @java.lang.Override public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo getGadget() { if (gadgetBuilder_ == null) { - if (entityCreateInfoCase_ == 13) { - return (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_; - } - return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance(); + return gadget_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance() : gadget_; } else { - if (entityCreateInfoCase_ == 13) { - return gadgetBuilder_.getMessage(); - } - return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance(); + return gadgetBuilder_.getMessage(); } } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ public Builder setGadget(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo value) { if (gadgetBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - entityCreateInfo_ = value; + gadget_ = value; onChanged(); } else { gadgetBuilder_.setMessage(value); } - entityCreateInfoCase_ = 13; + bitField0_ |= 0x00000001; return this; } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ public Builder setGadget( emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder builderForValue) { if (gadgetBuilder_ == null) { - entityCreateInfo_ = builderForValue.build(); + gadget_ = builderForValue.build(); onChanged(); } else { gadgetBuilder_.setMessage(builderForValue.build()); } - entityCreateInfoCase_ = 13; + bitField0_ |= 0x00000001; return this; } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ public Builder mergeGadget(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo value) { if (gadgetBuilder_ == null) { - if (entityCreateInfoCase_ == 13 && - entityCreateInfo_ != emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance()) { - entityCreateInfo_ = emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.newBuilder((emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_) - .mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) && + gadget_ != null && + gadget_ != emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance()) { + gadget_ = + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.newBuilder(gadget_).mergeFrom(value).buildPartial(); } else { - entityCreateInfo_ = value; + gadget_ = value; } onChanged(); } else { - if (entityCreateInfoCase_ == 13) { - gadgetBuilder_.mergeFrom(value); - } - gadgetBuilder_.setMessage(value); + gadgetBuilder_.mergeFrom(value); } - entityCreateInfoCase_ = 13; + bitField0_ |= 0x00000001; return this; } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ public Builder clearGadget() { if (gadgetBuilder_ == null) { - if (entityCreateInfoCase_ == 13) { - entityCreateInfoCase_ = 0; - entityCreateInfo_ = null; - onChanged(); - } + gadget_ = null; + onChanged(); } else { - if (entityCreateInfoCase_ == 13) { - entityCreateInfoCase_ = 0; - entityCreateInfo_ = null; - } gadgetBuilder_.clear(); } + bitField0_ = (bitField0_ & ~0x00000001); return this; } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder getGadgetBuilder() { + bitField0_ |= 0x00000001; + onChanged(); return getGadgetFieldBuilder().getBuilder(); } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ - @java.lang.Override public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder getGadgetOrBuilder() { - if ((entityCreateInfoCase_ == 13) && (gadgetBuilder_ != null)) { + if (gadgetBuilder_ != null) { return gadgetBuilder_.getMessageOrBuilder(); } else { - if (entityCreateInfoCase_ == 13) { - return (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_; - } - return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance(); + return gadget_ == null ? + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance() : gadget_; } } /** - * .CreateGadgetInfo gadget = 13; + * optional .CreateGadgetInfo gadget = 13; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder> getGadgetFieldBuilder() { if (gadgetBuilder_ == null) { - if (!(entityCreateInfoCase_ == 13)) { - entityCreateInfo_ = emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance(); - } gadgetBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder>( - (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_, + getGadget(), getParentForChildren(), isClean()); - entityCreateInfo_ = null; + gadget_ = null; } - entityCreateInfoCase_ = 13; - onChanged();; return gadgetBuilder_; } @java.lang.Override @@ -1920,15 +1842,15 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo get static { java.lang.String[] descriptorData = { "\n\026CreateEntityInfo.proto\032\014Vector.proto\032\026" + - "CreateGadgetInfo.proto\"\237\002\n\020CreateEntityI" + + "CreateGadgetInfo.proto\"\227\002\n\020CreateEntityI" + "nfo\022\r\n\005level\030\005 \001(\r\022\024\n\003pos\030\006 \001(\0132\007.Vector" + "\022\024\n\003rot\030\007 \001(\0132\007.Vector\022\020\n\010scene_id\030\n \001(\r" + "\022\017\n\007room_id\030\013 \001(\r\022\030\n\020client_unique_id\030\014 " + "\001(\r\022\024\n\nmonster_id\030\001 \001(\rH\000\022\020\n\006npc_id\030\002 \001(" + "\rH\000\022\023\n\tgadget_id\030\003 \001(\rH\000\022\021\n\007item_id\030\004 \001(" + - "\rH\000\022#\n\006gadget\030\r \001(\0132\021.CreateGadgetInfoH\001" + - "B\010\n\006EntityB\024\n\022entity_create_infoB\033\n\031emu." + - "grasscutter.net.protob\006proto3" + "\rH\000\022&\n\006gadget\030\r \001(\0132\021.CreateGadgetInfoH\001" + + "\210\001\001B\010\n\006EntityB\t\n\007_gadgetB\033\n\031emu.grasscut" + + "ter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1941,7 +1863,7 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo get internal_static_CreateEntityInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CreateEntityInfo_descriptor, - new java.lang.String[] { "Level", "Pos", "Rot", "SceneId", "RoomId", "ClientUniqueId", "MonsterId", "NpcId", "GadgetId", "ItemId", "Gadget", "Entity", "EntityCreateInfo", }); + new java.lang.String[] { "Level", "Pos", "Rot", "SceneId", "RoomId", "ClientUniqueId", "MonsterId", "NpcId", "GadgetId", "ItemId", "Gadget", "Entity", "Gadget", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CreateGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CreateGadgetInfoOuterClass.java index 7c58e75fe9a..ffb4b14bda9 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CreateGadgetInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CreateGadgetInfoOuterClass.java @@ -30,19 +30,19 @@ public interface CreateGadgetInfoOrBuilder extends emu.grasscutter.net.proto.GadgetBornTypeOuterClass.GadgetBornType getBornType(); /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; * @return Whether the chest field is set. */ boolean hasChest(); /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; * @return The chest. */ - emu.grasscutter.net.proto.ChestOuterClass.Chest getChest(); + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getChest(); /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ - emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder getChestOrBuilder(); + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder getChestOrBuilder(); } /** * Protobuf type {@code CreateGadgetInfo} @@ -97,11 +97,11 @@ private CreateGadgetInfo( break; } case 18: { - emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder subBuilder = null; + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder subBuilder = null; if (chest_ != null) { subBuilder = chest_.toBuilder(); } - chest_ = input.readMessage(emu.grasscutter.net.proto.ChestOuterClass.Chest.parser(), extensionRegistry); + chest_ = input.readMessage(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(chest_); chest_ = subBuilder.buildPartial(); @@ -141,6 +141,573 @@ private CreateGadgetInfo( emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.class, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder.class); } + public interface ChestOrBuilder extends + // @@protoc_insertion_point(interface_extends:CreateGadgetInfo.Chest) + com.google.protobuf.MessageOrBuilder { + + /** + * uint32 chest_drop_id = 1; + * @return The chestDropId. + */ + int getChestDropId(); + + /** + * bool is_show_cutscene = 2; + * @return The isShowCutscene. + */ + boolean getIsShowCutscene(); + } + /** + * 
+     * Obf: FGAGBNDOGCB
+     *
+ * + * Protobuf type {@code CreateGadgetInfo.Chest} + */ + public static final class Chest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:CreateGadgetInfo.Chest) + ChestOrBuilder { + private static final long serialVersionUID = 0L; + // Use Chest.newBuilder() to construct. + private Chest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Chest() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new Chest(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Chest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + + chestDropId_ = input.readUInt32(); + break; + } + case 16: { + + isShowCutscene_ = input.readBool(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.class, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder.class); + } + + public static final int CHEST_DROP_ID_FIELD_NUMBER = 1; + private int chestDropId_; + /** + * uint32 chest_drop_id = 1; + * @return The chestDropId. + */ + @java.lang.Override + public int getChestDropId() { + return chestDropId_; + } + + public static final int IS_SHOW_CUTSCENE_FIELD_NUMBER = 2; + private boolean isShowCutscene_; + /** + * bool is_show_cutscene = 2; + * @return The isShowCutscene. + */ + @java.lang.Override + public boolean getIsShowCutscene() { + return isShowCutscene_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (chestDropId_ != 0) { + output.writeUInt32(1, chestDropId_); + } + if (isShowCutscene_ != false) { + output.writeBool(2, isShowCutscene_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (chestDropId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(1, chestDropId_); + } + if (isShowCutscene_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(2, isShowCutscene_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest other = (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest) obj; + + if (getChestDropId() + != other.getChestDropId()) return false; + if (getIsShowCutscene() + != other.getIsShowCutscene()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + CHEST_DROP_ID_FIELD_NUMBER; + hash = (53 * hash) + getChestDropId(); + hash = (37 * hash) + IS_SHOW_CUTSCENE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsShowCutscene()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+       * Obf: FGAGBNDOGCB
+       *
+ * + * Protobuf type {@code CreateGadgetInfo.Chest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:CreateGadgetInfo.Chest) + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.class, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + chestDropId_ = 0; + + isShowCutscene_ = false; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getDefaultInstanceForType() { + return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest build() { + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest buildPartial() { + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest result = new emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest(this); + result.chestDropId_ = chestDropId_; + result.isShowCutscene_ = isShowCutscene_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest) { + return mergeFrom((emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest other) { + if (other == emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance()) return this; + if (other.getChestDropId() != 0) { + setChestDropId(other.getChestDropId()); + } + if (other.getIsShowCutscene() != false) { + setIsShowCutscene(other.getIsShowCutscene()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private int chestDropId_ ; + /** + * uint32 chest_drop_id = 1; + * @return The chestDropId. + */ + @java.lang.Override + public int getChestDropId() { + return chestDropId_; + } + /** + * uint32 chest_drop_id = 1; + * @param value The chestDropId to set. + * @return This builder for chaining. + */ + public Builder setChestDropId(int value) { + + chestDropId_ = value; + onChanged(); + return this; + } + /** + * uint32 chest_drop_id = 1; + * @return This builder for chaining. + */ + public Builder clearChestDropId() { + + chestDropId_ = 0; + onChanged(); + return this; + } + + private boolean isShowCutscene_ ; + /** + * bool is_show_cutscene = 2; + * @return The isShowCutscene. + */ + @java.lang.Override + public boolean getIsShowCutscene() { + return isShowCutscene_; + } + /** + * bool is_show_cutscene = 2; + * @param value The isShowCutscene to set. + * @return This builder for chaining. + */ + public Builder setIsShowCutscene(boolean value) { + + isShowCutscene_ = value; + onChanged(); + return this; + } + /** + * bool is_show_cutscene = 2; + * @return This builder for chaining. + */ + public Builder clearIsShowCutscene() { + + isShowCutscene_ = false; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:CreateGadgetInfo.Chest) + } + + // @@protoc_insertion_point(class_scope:CreateGadgetInfo.Chest) + private static final emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest(); + } + + public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public Chest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Chest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + public static final int BORN_TYPE_FIELD_NUMBER = 1; private int bornType_; /** @@ -161,9 +728,9 @@ private CreateGadgetInfo( } public static final int CHEST_FIELD_NUMBER = 2; - private emu.grasscutter.net.proto.ChestOuterClass.Chest chest_; + private emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest chest_; /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; * @return Whether the chest field is set. */ @java.lang.Override @@ -171,18 +738,18 @@ public boolean hasChest() { return chest_ != null; } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; * @return The chest. */ @java.lang.Override - public emu.grasscutter.net.proto.ChestOuterClass.Chest getChest() { - return chest_ == null ? emu.grasscutter.net.proto.ChestOuterClass.Chest.getDefaultInstance() : chest_; + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getChest() { + return chest_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance() : chest_; } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ @java.lang.Override - public emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder getChestOrBuilder() { + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder getChestOrBuilder() { return getChest(); } @@ -571,31 +1138,31 @@ public Builder clearBornType() { return this; } - private emu.grasscutter.net.proto.ChestOuterClass.Chest chest_; + private emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest chest_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ChestOuterClass.Chest, emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder, emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder> chestBuilder_; + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder> chestBuilder_; /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; * @return Whether the chest field is set. */ public boolean hasChest() { return chestBuilder_ != null || chest_ != null; } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; * @return The chest. */ - public emu.grasscutter.net.proto.ChestOuterClass.Chest getChest() { + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getChest() { if (chestBuilder_ == null) { - return chest_ == null ? emu.grasscutter.net.proto.ChestOuterClass.Chest.getDefaultInstance() : chest_; + return chest_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance() : chest_; } else { return chestBuilder_.getMessage(); } } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ - public Builder setChest(emu.grasscutter.net.proto.ChestOuterClass.Chest value) { + public Builder setChest(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest value) { if (chestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -609,10 +1176,10 @@ public Builder setChest(emu.grasscutter.net.proto.ChestOuterClass.Chest value) { return this; } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ public Builder setChest( - emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder builderForValue) { + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder builderForValue) { if (chestBuilder_ == null) { chest_ = builderForValue.build(); onChanged(); @@ -623,13 +1190,13 @@ public Builder setChest( return this; } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ - public Builder mergeChest(emu.grasscutter.net.proto.ChestOuterClass.Chest value) { + public Builder mergeChest(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest value) { if (chestBuilder_ == null) { if (chest_ != null) { chest_ = - emu.grasscutter.net.proto.ChestOuterClass.Chest.newBuilder(chest_).mergeFrom(value).buildPartial(); + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.newBuilder(chest_).mergeFrom(value).buildPartial(); } else { chest_ = value; } @@ -641,7 +1208,7 @@ public Builder mergeChest(emu.grasscutter.net.proto.ChestOuterClass.Chest value) return this; } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ public Builder clearChest() { if (chestBuilder_ == null) { @@ -655,33 +1222,33 @@ public Builder clearChest() { return this; } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ - public emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder getChestBuilder() { + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder getChestBuilder() { onChanged(); return getChestFieldBuilder().getBuilder(); } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ - public emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder getChestOrBuilder() { + public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder getChestOrBuilder() { if (chestBuilder_ != null) { return chestBuilder_.getMessageOrBuilder(); } else { return chest_ == null ? - emu.grasscutter.net.proto.ChestOuterClass.Chest.getDefaultInstance() : chest_; + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance() : chest_; } } /** - * .Chest chest = 2; + * .CreateGadgetInfo.Chest chest = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ChestOuterClass.Chest, emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder, emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder> + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder> getChestFieldBuilder() { if (chestBuilder_ == null) { chestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ChestOuterClass.Chest, emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder, emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder>( + emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder>( getChest(), getParentForChildren(), isClean()); @@ -747,6 +1314,11 @@ public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo get private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_CreateGadgetInfo_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_CreateGadgetInfo_Chest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_CreateGadgetInfo_Chest_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -757,16 +1329,16 @@ public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo get static { java.lang.String[] descriptorData = { "\n\026CreateGadgetInfo.proto\032\024GadgetBornType" + - ".proto\032\013Chest.proto\"M\n\020CreateGadgetInfo\022" + - "\"\n\tborn_type\030\001 \001(\0162\017.GadgetBornType\022\025\n\005c" + - "hest\030\002 \001(\0132\006.ChestB\033\n\031emu.grasscutter.ne" + - "t.protob\006proto3" + ".proto\"\230\001\n\020CreateGadgetInfo\022\"\n\tborn_type" + + "\030\001 \001(\0162\017.GadgetBornType\022&\n\005chest\030\002 \001(\0132\027" + + ".CreateGadgetInfo.Chest\0328\n\005Chest\022\025\n\rches" + + "t_drop_id\030\001 \001(\r\022\030\n\020is_show_cutscene\030\002 \001(" + + "\010B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor(), - emu.grasscutter.net.proto.ChestOuterClass.getDescriptor(), }); internal_static_CreateGadgetInfo_descriptor = getDescriptor().getMessageTypes().get(0); @@ -774,8 +1346,13 @@ public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo get com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CreateGadgetInfo_descriptor, new java.lang.String[] { "BornType", "Chest", }); + internal_static_CreateGadgetInfo_Chest_descriptor = + internal_static_CreateGadgetInfo_descriptor.getNestedTypes().get(0); + internal_static_CreateGadgetInfo_Chest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_CreateGadgetInfo_Chest_descriptor, + new java.lang.String[] { "ChestDropId", "IsShowCutscene", }); emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor(); - emu.grasscutter.net.proto.ChestOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CrystalLinkDungeonSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CrystalLinkDungeonSettleInfoOuterClass.java index 2ca4b102a9b..24885f115e8 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/CrystalLinkDungeonSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/CrystalLinkDungeonSettleInfoOuterClass.java @@ -19,52 +19,48 @@ public interface CrystalLinkDungeonSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 DEJJPIOCJDD = 15; - * @return The dEJJPIOCJDD. + * uint32 DFPNKFEKIIG = 2; + * @return The dFPNKFEKIIG. */ - int getDEJJPIOCJDD(); + int getDFPNKFEKIIG(); /** - * uint32 final_score = 12; - * @return The finalScore. + * uint32 ONHOJOBNAPM = 3; + * @return The oNHOJOBNAPM. */ - int getFinalScore(); + int getONHOJOBNAPM(); /** - * uint32 level_id = 3; - * @return The levelId. + * uint32 DEOOCBAKMCJ = 5; + * @return The dEOOCBAKMCJ. */ - int getLevelId(); + int getDEOOCBAKMCJ(); /** - * uint32 ENBKLKPPLHL = 6; - * @return The eNBKLKPPLHL. + * bool DGCMIKFMKHP = 6; + * @return The dGCMIKFMKHP. */ - int getENBKLKPPLHL(); + boolean getDGCMIKFMKHP(); /** - * uint32 difficulty_id = 5; - * @return The difficultyId. + * bool is_new_record = 8; + * @return The isNewRecord. */ - int getDifficultyId(); + boolean getIsNewRecord(); /** - * bool is_new_record = 7; - * @return The isNewRecord. + * uint32 PJJAOILBFBN = 11; + * @return The pJJAOILBFBN. */ - boolean getIsNewRecord(); + int getPJJAOILBFBN(); /** - * bool PDKDBGNJPDL = 8; - * @return The pDKDBGNJPDL. + * uint32 final_score = 15; + * @return The finalScore. */ - boolean getPDKDBGNJPDL(); + int getFinalScore(); } /** - * 
-   * Obf: CPMOMCPKNBD
-   *
- * * Protobuf type {@code CrystalLinkDungeonSettleInfo} */ public static final class CrystalLinkDungeonSettleInfo extends @@ -109,39 +105,39 @@ private CrystalLinkDungeonSettleInfo( case 0: done = true; break; - case 24: { + case 16: { - levelId_ = input.readUInt32(); + dFPNKFEKIIG_ = input.readUInt32(); break; } - case 40: { + case 24: { - difficultyId_ = input.readUInt32(); + oNHOJOBNAPM_ = input.readUInt32(); break; } - case 48: { + case 40: { - eNBKLKPPLHL_ = input.readUInt32(); + dEOOCBAKMCJ_ = input.readUInt32(); break; } - case 56: { + case 48: { - isNewRecord_ = input.readBool(); + dGCMIKFMKHP_ = input.readBool(); break; } case 64: { - pDKDBGNJPDL_ = input.readBool(); + isNewRecord_ = input.readBool(); break; } - case 96: { + case 88: { - finalScore_ = input.readUInt32(); + pJJAOILBFBN_ = input.readUInt32(); break; } case 120: { - dEJJPIOCJDD_ = input.readUInt32(); + finalScore_ = input.readUInt32(); break; } default: { @@ -176,81 +172,81 @@ private CrystalLinkDungeonSettleInfo( emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.class, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder.class); } - public static final int DEJJPIOCJDD_FIELD_NUMBER = 15; - private int dEJJPIOCJDD_; + public static final int DFPNKFEKIIG_FIELD_NUMBER = 2; + private int dFPNKFEKIIG_; /** - * uint32 DEJJPIOCJDD = 15; - * @return The dEJJPIOCJDD. + * uint32 DFPNKFEKIIG = 2; + * @return The dFPNKFEKIIG. */ @java.lang.Override - public int getDEJJPIOCJDD() { - return dEJJPIOCJDD_; + public int getDFPNKFEKIIG() { + return dFPNKFEKIIG_; } - public static final int FINAL_SCORE_FIELD_NUMBER = 12; - private int finalScore_; + public static final int ONHOJOBNAPM_FIELD_NUMBER = 3; + private int oNHOJOBNAPM_; /** - * uint32 final_score = 12; - * @return The finalScore. + * uint32 ONHOJOBNAPM = 3; + * @return The oNHOJOBNAPM. */ @java.lang.Override - public int getFinalScore() { - return finalScore_; + public int getONHOJOBNAPM() { + return oNHOJOBNAPM_; } - public static final int LEVEL_ID_FIELD_NUMBER = 3; - private int levelId_; + public static final int DEOOCBAKMCJ_FIELD_NUMBER = 5; + private int dEOOCBAKMCJ_; /** - * uint32 level_id = 3; - * @return The levelId. + * uint32 DEOOCBAKMCJ = 5; + * @return The dEOOCBAKMCJ. */ @java.lang.Override - public int getLevelId() { - return levelId_; + public int getDEOOCBAKMCJ() { + return dEOOCBAKMCJ_; } - public static final int ENBKLKPPLHL_FIELD_NUMBER = 6; - private int eNBKLKPPLHL_; + public static final int DGCMIKFMKHP_FIELD_NUMBER = 6; + private boolean dGCMIKFMKHP_; /** - * uint32 ENBKLKPPLHL = 6; - * @return The eNBKLKPPLHL. + * bool DGCMIKFMKHP = 6; + * @return The dGCMIKFMKHP. */ @java.lang.Override - public int getENBKLKPPLHL() { - return eNBKLKPPLHL_; + public boolean getDGCMIKFMKHP() { + return dGCMIKFMKHP_; } - public static final int DIFFICULTY_ID_FIELD_NUMBER = 5; - private int difficultyId_; + public static final int IS_NEW_RECORD_FIELD_NUMBER = 8; + private boolean isNewRecord_; /** - * uint32 difficulty_id = 5; - * @return The difficultyId. + * bool is_new_record = 8; + * @return The isNewRecord. */ @java.lang.Override - public int getDifficultyId() { - return difficultyId_; + public boolean getIsNewRecord() { + return isNewRecord_; } - public static final int IS_NEW_RECORD_FIELD_NUMBER = 7; - private boolean isNewRecord_; + public static final int PJJAOILBFBN_FIELD_NUMBER = 11; + private int pJJAOILBFBN_; /** - * bool is_new_record = 7; - * @return The isNewRecord. + * uint32 PJJAOILBFBN = 11; + * @return The pJJAOILBFBN. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } - public static final int PDKDBGNJPDL_FIELD_NUMBER = 8; - private boolean pDKDBGNJPDL_; + public static final int FINAL_SCORE_FIELD_NUMBER = 15; + private int finalScore_; /** - * bool PDKDBGNJPDL = 8; - * @return The pDKDBGNJPDL. + * uint32 final_score = 15; + * @return The finalScore. */ @java.lang.Override - public boolean getPDKDBGNJPDL() { - return pDKDBGNJPDL_; + public int getFinalScore() { + return finalScore_; } private byte memoizedIsInitialized = -1; @@ -267,26 +263,26 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (levelId_ != 0) { - output.writeUInt32(3, levelId_); + if (dFPNKFEKIIG_ != 0) { + output.writeUInt32(2, dFPNKFEKIIG_); } - if (difficultyId_ != 0) { - output.writeUInt32(5, difficultyId_); + if (oNHOJOBNAPM_ != 0) { + output.writeUInt32(3, oNHOJOBNAPM_); } - if (eNBKLKPPLHL_ != 0) { - output.writeUInt32(6, eNBKLKPPLHL_); + if (dEOOCBAKMCJ_ != 0) { + output.writeUInt32(5, dEOOCBAKMCJ_); + } + if (dGCMIKFMKHP_ != false) { + output.writeBool(6, dGCMIKFMKHP_); } if (isNewRecord_ != false) { - output.writeBool(7, isNewRecord_); + output.writeBool(8, isNewRecord_); } - if (pDKDBGNJPDL_ != false) { - output.writeBool(8, pDKDBGNJPDL_); + if (pJJAOILBFBN_ != 0) { + output.writeUInt32(11, pJJAOILBFBN_); } if (finalScore_ != 0) { - output.writeUInt32(12, finalScore_); - } - if (dEJJPIOCJDD_ != 0) { - output.writeUInt32(15, dEJJPIOCJDD_); + output.writeUInt32(15, finalScore_); } unknownFields.writeTo(output); } @@ -297,33 +293,33 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (levelId_ != 0) { + if (dFPNKFEKIIG_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, levelId_); + .computeUInt32Size(2, dFPNKFEKIIG_); } - if (difficultyId_ != 0) { + if (oNHOJOBNAPM_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, difficultyId_); + .computeUInt32Size(3, oNHOJOBNAPM_); } - if (eNBKLKPPLHL_ != 0) { + if (dEOOCBAKMCJ_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, eNBKLKPPLHL_); + .computeUInt32Size(5, dEOOCBAKMCJ_); } - if (isNewRecord_ != false) { + if (dGCMIKFMKHP_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, isNewRecord_); + .computeBoolSize(6, dGCMIKFMKHP_); } - if (pDKDBGNJPDL_ != false) { + if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(8, pDKDBGNJPDL_); + .computeBoolSize(8, isNewRecord_); } - if (finalScore_ != 0) { + if (pJJAOILBFBN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, finalScore_); + .computeUInt32Size(11, pJJAOILBFBN_); } - if (dEJJPIOCJDD_ != 0) { + if (finalScore_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, dEJJPIOCJDD_); + .computeUInt32Size(15, finalScore_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -340,20 +336,20 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo other = (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) obj; - if (getDEJJPIOCJDD() - != other.getDEJJPIOCJDD()) return false; - if (getFinalScore() - != other.getFinalScore()) return false; - if (getLevelId() - != other.getLevelId()) return false; - if (getENBKLKPPLHL() - != other.getENBKLKPPLHL()) return false; - if (getDifficultyId() - != other.getDifficultyId()) return false; + if (getDFPNKFEKIIG() + != other.getDFPNKFEKIIG()) return false; + if (getONHOJOBNAPM() + != other.getONHOJOBNAPM()) return false; + if (getDEOOCBAKMCJ() + != other.getDEOOCBAKMCJ()) return false; + if (getDGCMIKFMKHP() + != other.getDGCMIKFMKHP()) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; - if (getPDKDBGNJPDL() - != other.getPDKDBGNJPDL()) return false; + if (getPJJAOILBFBN() + != other.getPJJAOILBFBN()) return false; + if (getFinalScore() + != other.getFinalScore()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -365,22 +361,22 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + DEJJPIOCJDD_FIELD_NUMBER; - hash = (53 * hash) + getDEJJPIOCJDD(); - hash = (37 * hash) + FINAL_SCORE_FIELD_NUMBER; - hash = (53 * hash) + getFinalScore(); - hash = (37 * hash) + LEVEL_ID_FIELD_NUMBER; - hash = (53 * hash) + getLevelId(); - hash = (37 * hash) + ENBKLKPPLHL_FIELD_NUMBER; - hash = (53 * hash) + getENBKLKPPLHL(); - hash = (37 * hash) + DIFFICULTY_ID_FIELD_NUMBER; - hash = (53 * hash) + getDifficultyId(); + hash = (37 * hash) + DFPNKFEKIIG_FIELD_NUMBER; + hash = (53 * hash) + getDFPNKFEKIIG(); + hash = (37 * hash) + ONHOJOBNAPM_FIELD_NUMBER; + hash = (53 * hash) + getONHOJOBNAPM(); + hash = (37 * hash) + DEOOCBAKMCJ_FIELD_NUMBER; + hash = (53 * hash) + getDEOOCBAKMCJ(); + hash = (37 * hash) + DGCMIKFMKHP_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getDGCMIKFMKHP()); hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); - hash = (37 * hash) + PDKDBGNJPDL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getPDKDBGNJPDL()); + hash = (37 * hash) + PJJAOILBFBN_FIELD_NUMBER; + hash = (53 * hash) + getPJJAOILBFBN(); + hash = (37 * hash) + FINAL_SCORE_FIELD_NUMBER; + hash = (53 * hash) + getFinalScore(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -477,10 +473,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: CPMOMCPKNBD
-     *
- * * Protobuf type {@code CrystalLinkDungeonSettleInfo} */ public static final class Builder extends @@ -518,19 +510,19 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - dEJJPIOCJDD_ = 0; - - finalScore_ = 0; + dFPNKFEKIIG_ = 0; - levelId_ = 0; + oNHOJOBNAPM_ = 0; - eNBKLKPPLHL_ = 0; + dEOOCBAKMCJ_ = 0; - difficultyId_ = 0; + dGCMIKFMKHP_ = false; isNewRecord_ = false; - pDKDBGNJPDL_ = false; + pJJAOILBFBN_ = 0; + + finalScore_ = 0; return this; } @@ -558,13 +550,13 @@ public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalL @java.lang.Override public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo buildPartial() { emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo result = new emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo(this); - result.dEJJPIOCJDD_ = dEJJPIOCJDD_; - result.finalScore_ = finalScore_; - result.levelId_ = levelId_; - result.eNBKLKPPLHL_ = eNBKLKPPLHL_; - result.difficultyId_ = difficultyId_; + result.dFPNKFEKIIG_ = dFPNKFEKIIG_; + result.oNHOJOBNAPM_ = oNHOJOBNAPM_; + result.dEOOCBAKMCJ_ = dEOOCBAKMCJ_; + result.dGCMIKFMKHP_ = dGCMIKFMKHP_; result.isNewRecord_ = isNewRecord_; - result.pDKDBGNJPDL_ = pDKDBGNJPDL_; + result.pJJAOILBFBN_ = pJJAOILBFBN_; + result.finalScore_ = finalScore_; onBuilt(); return result; } @@ -613,26 +605,26 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo other) { if (other == emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance()) return this; - if (other.getDEJJPIOCJDD() != 0) { - setDEJJPIOCJDD(other.getDEJJPIOCJDD()); + if (other.getDFPNKFEKIIG() != 0) { + setDFPNKFEKIIG(other.getDFPNKFEKIIG()); } - if (other.getFinalScore() != 0) { - setFinalScore(other.getFinalScore()); - } - if (other.getLevelId() != 0) { - setLevelId(other.getLevelId()); + if (other.getONHOJOBNAPM() != 0) { + setONHOJOBNAPM(other.getONHOJOBNAPM()); } - if (other.getENBKLKPPLHL() != 0) { - setENBKLKPPLHL(other.getENBKLKPPLHL()); + if (other.getDEOOCBAKMCJ() != 0) { + setDEOOCBAKMCJ(other.getDEOOCBAKMCJ()); } - if (other.getDifficultyId() != 0) { - setDifficultyId(other.getDifficultyId()); + if (other.getDGCMIKFMKHP() != false) { + setDGCMIKFMKHP(other.getDGCMIKFMKHP()); } if (other.getIsNewRecord() != false) { setIsNewRecord(other.getIsNewRecord()); } - if (other.getPDKDBGNJPDL() != false) { - setPDKDBGNJPDL(other.getPDKDBGNJPDL()); + if (other.getPJJAOILBFBN() != 0) { + setPJJAOILBFBN(other.getPJJAOILBFBN()); + } + if (other.getFinalScore() != 0) { + setFinalScore(other.getFinalScore()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -663,219 +655,219 @@ public Builder mergeFrom( return this; } - private int dEJJPIOCJDD_ ; + private int dFPNKFEKIIG_ ; /** - * uint32 DEJJPIOCJDD = 15; - * @return The dEJJPIOCJDD. + * uint32 DFPNKFEKIIG = 2; + * @return The dFPNKFEKIIG. */ @java.lang.Override - public int getDEJJPIOCJDD() { - return dEJJPIOCJDD_; + public int getDFPNKFEKIIG() { + return dFPNKFEKIIG_; } /** - * uint32 DEJJPIOCJDD = 15; - * @param value The dEJJPIOCJDD to set. + * uint32 DFPNKFEKIIG = 2; + * @param value The dFPNKFEKIIG to set. * @return This builder for chaining. */ - public Builder setDEJJPIOCJDD(int value) { + public Builder setDFPNKFEKIIG(int value) { - dEJJPIOCJDD_ = value; + dFPNKFEKIIG_ = value; onChanged(); return this; } /** - * uint32 DEJJPIOCJDD = 15; + * uint32 DFPNKFEKIIG = 2; * @return This builder for chaining. */ - public Builder clearDEJJPIOCJDD() { + public Builder clearDFPNKFEKIIG() { - dEJJPIOCJDD_ = 0; + dFPNKFEKIIG_ = 0; onChanged(); return this; } - private int finalScore_ ; + private int oNHOJOBNAPM_ ; /** - * uint32 final_score = 12; - * @return The finalScore. + * uint32 ONHOJOBNAPM = 3; + * @return The oNHOJOBNAPM. */ @java.lang.Override - public int getFinalScore() { - return finalScore_; + public int getONHOJOBNAPM() { + return oNHOJOBNAPM_; } /** - * uint32 final_score = 12; - * @param value The finalScore to set. + * uint32 ONHOJOBNAPM = 3; + * @param value The oNHOJOBNAPM to set. * @return This builder for chaining. */ - public Builder setFinalScore(int value) { + public Builder setONHOJOBNAPM(int value) { - finalScore_ = value; + oNHOJOBNAPM_ = value; onChanged(); return this; } /** - * uint32 final_score = 12; + * uint32 ONHOJOBNAPM = 3; * @return This builder for chaining. */ - public Builder clearFinalScore() { + public Builder clearONHOJOBNAPM() { - finalScore_ = 0; + oNHOJOBNAPM_ = 0; onChanged(); return this; } - private int levelId_ ; + private int dEOOCBAKMCJ_ ; /** - * uint32 level_id = 3; - * @return The levelId. + * uint32 DEOOCBAKMCJ = 5; + * @return The dEOOCBAKMCJ. */ @java.lang.Override - public int getLevelId() { - return levelId_; + public int getDEOOCBAKMCJ() { + return dEOOCBAKMCJ_; } /** - * uint32 level_id = 3; - * @param value The levelId to set. + * uint32 DEOOCBAKMCJ = 5; + * @param value The dEOOCBAKMCJ to set. * @return This builder for chaining. */ - public Builder setLevelId(int value) { + public Builder setDEOOCBAKMCJ(int value) { - levelId_ = value; + dEOOCBAKMCJ_ = value; onChanged(); return this; } /** - * uint32 level_id = 3; + * uint32 DEOOCBAKMCJ = 5; * @return This builder for chaining. */ - public Builder clearLevelId() { + public Builder clearDEOOCBAKMCJ() { - levelId_ = 0; + dEOOCBAKMCJ_ = 0; onChanged(); return this; } - private int eNBKLKPPLHL_ ; + private boolean dGCMIKFMKHP_ ; /** - * uint32 ENBKLKPPLHL = 6; - * @return The eNBKLKPPLHL. + * bool DGCMIKFMKHP = 6; + * @return The dGCMIKFMKHP. */ @java.lang.Override - public int getENBKLKPPLHL() { - return eNBKLKPPLHL_; + public boolean getDGCMIKFMKHP() { + return dGCMIKFMKHP_; } /** - * uint32 ENBKLKPPLHL = 6; - * @param value The eNBKLKPPLHL to set. + * bool DGCMIKFMKHP = 6; + * @param value The dGCMIKFMKHP to set. * @return This builder for chaining. */ - public Builder setENBKLKPPLHL(int value) { + public Builder setDGCMIKFMKHP(boolean value) { - eNBKLKPPLHL_ = value; + dGCMIKFMKHP_ = value; onChanged(); return this; } /** - * uint32 ENBKLKPPLHL = 6; + * bool DGCMIKFMKHP = 6; * @return This builder for chaining. */ - public Builder clearENBKLKPPLHL() { + public Builder clearDGCMIKFMKHP() { - eNBKLKPPLHL_ = 0; + dGCMIKFMKHP_ = false; onChanged(); return this; } - private int difficultyId_ ; + private boolean isNewRecord_ ; /** - * uint32 difficulty_id = 5; - * @return The difficultyId. + * bool is_new_record = 8; + * @return The isNewRecord. */ @java.lang.Override - public int getDifficultyId() { - return difficultyId_; + public boolean getIsNewRecord() { + return isNewRecord_; } /** - * uint32 difficulty_id = 5; - * @param value The difficultyId to set. + * bool is_new_record = 8; + * @param value The isNewRecord to set. * @return This builder for chaining. */ - public Builder setDifficultyId(int value) { + public Builder setIsNewRecord(boolean value) { - difficultyId_ = value; + isNewRecord_ = value; onChanged(); return this; } /** - * uint32 difficulty_id = 5; + * bool is_new_record = 8; * @return This builder for chaining. */ - public Builder clearDifficultyId() { + public Builder clearIsNewRecord() { - difficultyId_ = 0; + isNewRecord_ = false; onChanged(); return this; } - private boolean isNewRecord_ ; + private int pJJAOILBFBN_ ; /** - * bool is_new_record = 7; - * @return The isNewRecord. + * uint32 PJJAOILBFBN = 11; + * @return The pJJAOILBFBN. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } /** - * bool is_new_record = 7; - * @param value The isNewRecord to set. + * uint32 PJJAOILBFBN = 11; + * @param value The pJJAOILBFBN to set. * @return This builder for chaining. */ - public Builder setIsNewRecord(boolean value) { + public Builder setPJJAOILBFBN(int value) { - isNewRecord_ = value; + pJJAOILBFBN_ = value; onChanged(); return this; } /** - * bool is_new_record = 7; + * uint32 PJJAOILBFBN = 11; * @return This builder for chaining. */ - public Builder clearIsNewRecord() { + public Builder clearPJJAOILBFBN() { - isNewRecord_ = false; + pJJAOILBFBN_ = 0; onChanged(); return this; } - private boolean pDKDBGNJPDL_ ; + private int finalScore_ ; /** - * bool PDKDBGNJPDL = 8; - * @return The pDKDBGNJPDL. + * uint32 final_score = 15; + * @return The finalScore. */ @java.lang.Override - public boolean getPDKDBGNJPDL() { - return pDKDBGNJPDL_; + public int getFinalScore() { + return finalScore_; } /** - * bool PDKDBGNJPDL = 8; - * @param value The pDKDBGNJPDL to set. + * uint32 final_score = 15; + * @param value The finalScore to set. * @return This builder for chaining. */ - public Builder setPDKDBGNJPDL(boolean value) { + public Builder setFinalScore(int value) { - pDKDBGNJPDL_ = value; + finalScore_ = value; onChanged(); return this; } /** - * bool PDKDBGNJPDL = 8; + * uint32 final_score = 15; * @return This builder for chaining. */ - public Builder clearPDKDBGNJPDL() { + public Builder clearFinalScore() { - pDKDBGNJPDL_ = false; + finalScore_ = 0; onChanged(); return this; } @@ -946,13 +938,13 @@ public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalL descriptor; static { java.lang.String[] descriptorData = { - "\n\"CrystalLinkDungeonSettleInfo.proto\"\262\001\n" + - "\034CrystalLinkDungeonSettleInfo\022\023\n\013DEJJPIO" + - "CJDD\030\017 \001(\r\022\023\n\013final_score\030\014 \001(\r\022\020\n\010level" + - "_id\030\003 \001(\r\022\023\n\013ENBKLKPPLHL\030\006 \001(\r\022\025\n\rdiffic" + - "ulty_id\030\005 \001(\r\022\025\n\ris_new_record\030\007 \001(\010\022\023\n\013" + - "PDKDBGNJPDL\030\010 \001(\010B\033\n\031emu.grasscutter.net" + - ".protob\006proto3" + "\n\"CrystalLinkDungeonSettleInfo.proto\"\263\001\n" + + "\034CrystalLinkDungeonSettleInfo\022\023\n\013DFPNKFE" + + "KIIG\030\002 \001(\r\022\023\n\013ONHOJOBNAPM\030\003 \001(\r\022\023\n\013DEOOC" + + "BAKMCJ\030\005 \001(\r\022\023\n\013DGCMIKFMKHP\030\006 \001(\010\022\025\n\ris_" + + "new_record\030\010 \001(\010\022\023\n\013PJJAOILBFBN\030\013 \001(\r\022\023\n" + + "\013final_score\030\017 \001(\rB\033\n\031emu.grasscutter.ne" + + "t.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -963,7 +955,7 @@ public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalL internal_static_CrystalLinkDungeonSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_CrystalLinkDungeonSettleInfo_descriptor, - new java.lang.String[] { "DEJJPIOCJDD", "FinalScore", "LevelId", "ENBKLKPPLHL", "DifficultyId", "IsNewRecord", "PDKDBGNJPDL", }); + new java.lang.String[] { "DFPNKFEKIIG", "ONHOJOBNAPM", "DEOOCBAKMCJ", "DGCMIKFMKHP", "IsNewRecord", "PJJAOILBFBN", "FinalScore", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamReqOuterClass.java index 02b81658ede..7161ccff7bc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamReqOuterClass.java @@ -27,6 +27,7 @@ public interface DelBackupAvatarTeamReqOrBuilder extends /** * 
    * CmdId: 8721
+   * obf: OBOEHFNLFOD
    *
* * Protobuf type {@code DelBackupAvatarTeamReq} @@ -279,6 +280,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 8721
+     * obf: OBOEHFNLFOD
      *
* * Protobuf type {@code DelBackupAvatarTeamReq} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamRspOuterClass.java index 4f8be85175a..d64abd2e02d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamRspOuterClass.java @@ -33,6 +33,7 @@ public interface DelBackupAvatarTeamRspOrBuilder extends /** * 
    * CmdId: 7408
+   * obf: PKJCPHLNGGJ
    *
* * Protobuf type {@code DelBackupAvatarTeamRsp} @@ -312,6 +313,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 7408
+     * obf: PKJCPHLNGGJ
      *
* * Protobuf type {@code DelBackupAvatarTeamRsp} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DelScenePlayTeamEntityNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelScenePlayTeamEntityNotifyOuterClass.java index 7908c9a23b3..13f64552395 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DelScenePlayTeamEntityNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DelScenePlayTeamEntityNotifyOuterClass.java @@ -36,15 +36,16 @@ public interface DelScenePlayTeamEntityNotifyOrBuilder extends int getDelEntityIdList(int index); /** - * uint32 scene_id = 9; + * uint32 scene_id = 5; * @return The sceneId. */ int getSceneId(); } /** * 
-   * CmdId: 2438
-   * Obf: KDDMNAMPHDO
+   * DelTeamEntityNotify or DelScenePlayTeamEntityNotify
+   * CmdId: 26259
+   * obf: OPGBCCDGDIE
    *
* * Protobuf type {@code DelScenePlayTeamEntityNotify} @@ -114,7 +115,7 @@ private DelScenePlayTeamEntityNotify( input.popLimit(limit); break; } - case 72: { + case 40: { sceneId_ = input.readUInt32(); break; @@ -182,10 +183,10 @@ public int getDelEntityIdList(int index) { } private int delEntityIdListMemoizedSerializedSize = -1; - public static final int SCENE_ID_FIELD_NUMBER = 9; + public static final int SCENE_ID_FIELD_NUMBER = 5; private int sceneId_; /** - * uint32 scene_id = 9; + * uint32 scene_id = 5; * @return The sceneId. */ @java.lang.Override @@ -216,7 +217,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeUInt32NoTag(delEntityIdList_.getInt(i)); } if (sceneId_ != 0) { - output.writeUInt32(9, sceneId_); + output.writeUInt32(5, sceneId_); } unknownFields.writeTo(output); } @@ -243,7 +244,7 @@ public int getSerializedSize() { } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, sceneId_); + .computeUInt32Size(5, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -378,8 +379,9 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2438
-     * Obf: KDDMNAMPHDO
+     * DelTeamEntityNotify or DelScenePlayTeamEntityNotify
+     * CmdId: 26259
+     * obf: OPGBCCDGDIE
      *
* * Protobuf type {@code DelScenePlayTeamEntityNotify} @@ -628,7 +630,7 @@ public Builder clearDelEntityIdList() { private int sceneId_ ; /** - * uint32 scene_id = 9; + * uint32 scene_id = 5; * @return The sceneId. */ @java.lang.Override @@ -636,7 +638,7 @@ public int getSceneId() { return sceneId_; } /** - * uint32 scene_id = 9; + * uint32 scene_id = 5; * @param value The sceneId to set. * @return This builder for chaining. */ @@ -647,7 +649,7 @@ public Builder setSceneId(int value) { return this; } /** - * uint32 scene_id = 9; + * uint32 scene_id = 5; * @return This builder for chaining. */ public Builder clearSceneId() { @@ -725,7 +727,7 @@ public emu.grasscutter.net.proto.DelScenePlayTeamEntityNotifyOuterClass.DelScene java.lang.String[] descriptorData = { "\n\"DelScenePlayTeamEntityNotify.proto\"L\n\034" + "DelScenePlayTeamEntityNotify\022\032\n\022del_enti" + - "ty_id_list\030\002 \003(\r\022\020\n\010scene_id\030\t \001(\rB\033\n\031em" + + "ty_id_list\030\002 \003(\r\022\020\n\010scene_id\030\005 \001(\rB\033\n\031em" + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DelTeamEntityNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelTeamEntityNotifyOuterClass.java index e4de6cfb42b..5418bcef607 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DelTeamEntityNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DelTeamEntityNotifyOuterClass.java @@ -19,32 +19,33 @@ public interface DelTeamEntityNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @return A list containing the delEntityIdList. */ java.util.List getDelEntityIdListList(); /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @return The count of delEntityIdList. */ int getDelEntityIdListCount(); /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @param index The index of the element to return. * @return The delEntityIdList at the given index. */ int getDelEntityIdList(int index); /** - * uint32 scene_id = 15; + * uint32 scene_id = 6; * @return The sceneId. */ int getSceneId(); } /** * 
-   * CmdId: 4320
-   * Obf: PPAHLMFGPPN
+   * DelTeamEntityNotify or DelScenePlayTeamEntityNotify
+   * CmdId: 29714
+   * obf: GEIOMAELNGM
    *
* * Protobuf type {@code DelTeamEntityNotify} @@ -93,7 +94,7 @@ private DelTeamEntityNotify( case 0: done = true; break; - case 56: { + case 24: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { delEntityIdList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -101,7 +102,7 @@ private DelTeamEntityNotify( delEntityIdList_.addInt(input.readUInt32()); break; } - case 58: { + case 26: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -114,7 +115,7 @@ private DelTeamEntityNotify( input.popLimit(limit); break; } - case 120: { + case 48: { sceneId_ = input.readUInt32(); break; @@ -154,10 +155,10 @@ private DelTeamEntityNotify( emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify.class, emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNotify.Builder.class); } - public static final int DEL_ENTITY_ID_LIST_FIELD_NUMBER = 7; + public static final int DEL_ENTITY_ID_LIST_FIELD_NUMBER = 3; private com.google.protobuf.Internal.IntList delEntityIdList_; /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @return A list containing the delEntityIdList. */ @java.lang.Override @@ -166,14 +167,14 @@ private DelTeamEntityNotify( return delEntityIdList_; } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @return The count of delEntityIdList. */ public int getDelEntityIdListCount() { return delEntityIdList_.size(); } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @param index The index of the element to return. * @return The delEntityIdList at the given index. */ @@ -182,10 +183,10 @@ public int getDelEntityIdList(int index) { } private int delEntityIdListMemoizedSerializedSize = -1; - public static final int SCENE_ID_FIELD_NUMBER = 15; + public static final int SCENE_ID_FIELD_NUMBER = 6; private int sceneId_; /** - * uint32 scene_id = 15; + * uint32 scene_id = 6; * @return The sceneId. */ @java.lang.Override @@ -209,14 +210,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (getDelEntityIdListList().size() > 0) { - output.writeUInt32NoTag(58); + output.writeUInt32NoTag(26); output.writeUInt32NoTag(delEntityIdListMemoizedSerializedSize); } for (int i = 0; i < delEntityIdList_.size(); i++) { output.writeUInt32NoTag(delEntityIdList_.getInt(i)); } if (sceneId_ != 0) { - output.writeUInt32(15, sceneId_); + output.writeUInt32(6, sceneId_); } unknownFields.writeTo(output); } @@ -243,7 +244,7 @@ public int getSerializedSize() { } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, sceneId_); + .computeUInt32Size(6, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -378,8 +379,9 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 4320
-     * Obf: PPAHLMFGPPN
+     * DelTeamEntityNotify or DelScenePlayTeamEntityNotify
+     * CmdId: 29714
+     * obf: GEIOMAELNGM
      *
* * Protobuf type {@code DelTeamEntityNotify} @@ -555,7 +557,7 @@ private void ensureDelEntityIdListIsMutable() { } } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @return A list containing the delEntityIdList. */ public java.util.List @@ -564,14 +566,14 @@ private void ensureDelEntityIdListIsMutable() { java.util.Collections.unmodifiableList(delEntityIdList_) : delEntityIdList_; } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @return The count of delEntityIdList. */ public int getDelEntityIdListCount() { return delEntityIdList_.size(); } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @param index The index of the element to return. * @return The delEntityIdList at the given index. */ @@ -579,7 +581,7 @@ public int getDelEntityIdList(int index) { return delEntityIdList_.getInt(index); } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @param index The index to set the value at. * @param value The delEntityIdList to set. * @return This builder for chaining. @@ -592,7 +594,7 @@ public Builder setDelEntityIdList( return this; } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @param value The delEntityIdList to add. * @return This builder for chaining. */ @@ -603,7 +605,7 @@ public Builder addDelEntityIdList(int value) { return this; } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @param values The delEntityIdList to add. * @return This builder for chaining. */ @@ -616,7 +618,7 @@ public Builder addAllDelEntityIdList( return this; } /** - * repeated uint32 del_entity_id_list = 7; + * repeated uint32 del_entity_id_list = 3; * @return This builder for chaining. */ public Builder clearDelEntityIdList() { @@ -628,7 +630,7 @@ public Builder clearDelEntityIdList() { private int sceneId_ ; /** - * uint32 scene_id = 15; + * uint32 scene_id = 6; * @return The sceneId. */ @java.lang.Override @@ -636,7 +638,7 @@ public int getSceneId() { return sceneId_; } /** - * uint32 scene_id = 15; + * uint32 scene_id = 6; * @param value The sceneId to set. * @return This builder for chaining. */ @@ -647,7 +649,7 @@ public Builder setSceneId(int value) { return this; } /** - * uint32 scene_id = 15; + * uint32 scene_id = 6; * @return This builder for chaining. */ public Builder clearSceneId() { @@ -724,8 +726,8 @@ public emu.grasscutter.net.proto.DelTeamEntityNotifyOuterClass.DelTeamEntityNoti static { java.lang.String[] descriptorData = { "\n\031DelTeamEntityNotify.proto\"C\n\023DelTeamEn" + - "tityNotify\022\032\n\022del_entity_id_list\030\007 \003(\r\022\020" + - "\n\010scene_id\030\017 \001(\rB\033\n\031emu.grasscutter.net." + + "tityNotify\022\032\n\022del_entity_id_list\030\003 \003(\r\022\020" + + "\n\010scene_id\030\006 \001(\rB\033\n\031emu.grasscutter.net." + "protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialReqOuterClass.java index ff6951fc60a..0526f110dca 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialReqOuterClass.java @@ -19,33 +19,33 @@ public interface DestroyMaterialReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ java.util.List getMaterialListList(); /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getMaterialList(int index); /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ int getMaterialListCount(); /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ java.util.List getMaterialListOrBuilderList(); /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder getMaterialListOrBuilder( int index); } /** * 
-   * CmdId: 6985
-   * Obf: MGALBJFALCL
+   * CmdId: 28057
+   * obf: OJJOGHCLAJO
    *
* * Protobuf type {@code DestroyMaterialReq} @@ -94,7 +94,7 @@ private DestroyMaterialReq( case 0: done = true; break; - case 74: { + case 50: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { materialList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -138,17 +138,17 @@ private DestroyMaterialReq( emu.grasscutter.net.proto.DestroyMaterialReqOuterClass.DestroyMaterialReq.class, emu.grasscutter.net.proto.DestroyMaterialReqOuterClass.DestroyMaterialReq.Builder.class); } - public static final int MATERIAL_LIST_FIELD_NUMBER = 9; + public static final int MATERIAL_LIST_FIELD_NUMBER = 6; private java.util.List materialList_; /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ @java.lang.Override public java.util.List getMaterialListList() { return materialList_; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ @java.lang.Override public java.util.List @@ -156,21 +156,21 @@ public java.util.Listrepeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ @java.lang.Override public int getMaterialListCount() { return materialList_.size(); } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getMaterialList(int index) { return materialList_.get(index); } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder getMaterialListOrBuilder( @@ -193,7 +193,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < materialList_.size(); i++) { - output.writeMessage(9, materialList_.get(i)); + output.writeMessage(6, materialList_.get(i)); } unknownFields.writeTo(output); } @@ -206,7 +206,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < materialList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, materialList_.get(i)); + .computeMessageSize(6, materialList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -337,8 +337,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 6985
-     * Obf: MGALBJFALCL
+     * CmdId: 28057
+     * obf: OJJOGHCLAJO
      *
* * Protobuf type {@code DestroyMaterialReq} @@ -538,7 +538,7 @@ private void ensureMaterialListIsMutable() { emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder> materialListBuilder_; /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public java.util.List getMaterialListList() { if (materialListBuilder_ == null) { @@ -548,7 +548,7 @@ public java.util.Listrepeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public int getMaterialListCount() { if (materialListBuilder_ == null) { @@ -558,7 +558,7 @@ public int getMaterialListCount() { } } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getMaterialList(int index) { if (materialListBuilder_ == null) { @@ -568,7 +568,7 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getMaterial } } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder setMaterialList( int index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo value) { @@ -585,7 +585,7 @@ public Builder setMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder setMaterialList( int index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder builderForValue) { @@ -599,7 +599,7 @@ public Builder setMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder addMaterialList(emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo value) { if (materialListBuilder_ == null) { @@ -615,7 +615,7 @@ public Builder addMaterialList(emu.grasscutter.net.proto.MaterialInfoOuterClass. return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder addMaterialList( int index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo value) { @@ -632,7 +632,7 @@ public Builder addMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder addMaterialList( emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder builderForValue) { @@ -646,7 +646,7 @@ public Builder addMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder addMaterialList( int index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder builderForValue) { @@ -660,7 +660,7 @@ public Builder addMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder addAllMaterialList( java.lang.Iterable values) { @@ -675,7 +675,7 @@ public Builder addAllMaterialList( return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder clearMaterialList() { if (materialListBuilder_ == null) { @@ -688,7 +688,7 @@ public Builder clearMaterialList() { return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public Builder removeMaterialList(int index) { if (materialListBuilder_ == null) { @@ -701,14 +701,14 @@ public Builder removeMaterialList(int index) { return this; } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder getMaterialListBuilder( int index) { return getMaterialListFieldBuilder().getBuilder(index); } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder getMaterialListOrBuilder( int index) { @@ -718,7 +718,7 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder ge } } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public java.util.List getMaterialListOrBuilderList() { @@ -729,14 +729,14 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfoOrBuilder ge } } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder addMaterialListBuilder() { return getMaterialListFieldBuilder().addBuilder( emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.getDefaultInstance()); } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder addMaterialListBuilder( int index) { @@ -744,7 +744,7 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.Builder add index, emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo.getDefaultInstance()); } /** - * repeated .MaterialInfo material_list = 9; + * repeated .MaterialInfo material_list = 6; */ public java.util.List getMaterialListBuilderList() { @@ -833,7 +833,7 @@ public emu.grasscutter.net.proto.DestroyMaterialReqOuterClass.DestroyMaterialReq java.lang.String[] descriptorData = { "\n\030DestroyMaterialReq.proto\032\022MaterialInfo" + ".proto\":\n\022DestroyMaterialReq\022$\n\rmaterial" + - "_list\030\t \003(\0132\r.MaterialInfoB\033\n\031emu.grassc" + + "_list\030\006 \003(\0132\r.MaterialInfoB\033\n\031emu.grassc" + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialRspOuterClass.java index 571ef8e4f4e..5e747b38b44 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DestroyMaterialRspOuterClass.java @@ -19,7 +19,7 @@ public interface DestroyMaterialRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 10; + * int32 retcode = 2; * @return The retcode. */ int getRetcode(); @@ -42,17 +42,17 @@ public interface DestroyMaterialRspOrBuilder extends int getItemIdList(int index); /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @return A list containing the itemCountList. */ java.util.List getItemCountListList(); /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @return The count of itemCountList. */ int getItemCountListCount(); /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @param index The index of the element to return. * @return The itemCountList at the given index. */ @@ -60,8 +60,8 @@ public interface DestroyMaterialRspOrBuilder extends } /** * 
-   * CmdId: 7572
-   * Obf: KIEBPLBPCAE
+   * CmdId: 21531
+   * obf: JBHOLOPBKPJ
    *
* * Protobuf type {@code DestroyMaterialRsp} @@ -112,24 +112,8 @@ private DestroyMaterialRsp( done = true; break; case 16: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - itemCountList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; - } - itemCountList_.addInt(input.readUInt32()); - break; - } - case 18: { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - itemCountList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; - } - while (input.getBytesUntilLimit() > 0) { - itemCountList_.addInt(input.readUInt32()); - } - input.popLimit(limit); + + retcode_ = input.readInt32(); break; } case 32: { @@ -153,9 +137,25 @@ private DestroyMaterialRsp( input.popLimit(limit); break; } - case 80: { - - retcode_ = input.readInt32(); + case 120: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + itemCountList_ = newIntList(); + mutable_bitField0_ |= 0x00000002; + } + itemCountList_.addInt(input.readUInt32()); + break; + } + case 122: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + itemCountList_ = newIntList(); + mutable_bitField0_ |= 0x00000002; + } + while (input.getBytesUntilLimit() > 0) { + itemCountList_.addInt(input.readUInt32()); + } + input.popLimit(limit); break; } default: { @@ -173,12 +173,12 @@ private DestroyMaterialRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - itemCountList_.makeImmutable(); // C - } if (((mutable_bitField0_ & 0x00000001) != 0)) { itemIdList_.makeImmutable(); // C } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + itemCountList_.makeImmutable(); // C + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -196,10 +196,10 @@ private DestroyMaterialRsp( emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.class, emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 10; + public static final int RETCODE_FIELD_NUMBER = 2; private int retcode_; /** - * int32 retcode = 10; + * int32 retcode = 2; * @return The retcode. */ @java.lang.Override @@ -235,10 +235,10 @@ public int getItemIdList(int index) { } private int itemIdListMemoizedSerializedSize = -1; - public static final int ITEM_COUNT_LIST_FIELD_NUMBER = 2; + public static final int ITEM_COUNT_LIST_FIELD_NUMBER = 15; private com.google.protobuf.Internal.IntList itemCountList_; /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @return A list containing the itemCountList. */ @java.lang.Override @@ -247,14 +247,14 @@ public int getItemIdList(int index) { return itemCountList_; } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @return The count of itemCountList. */ public int getItemCountListCount() { return itemCountList_.size(); } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @param index The index of the element to return. * @return The itemCountList at the given index. */ @@ -278,12 +278,8 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (getItemCountListList().size() > 0) { - output.writeUInt32NoTag(18); - output.writeUInt32NoTag(itemCountListMemoizedSerializedSize); - } - for (int i = 0; i < itemCountList_.size(); i++) { - output.writeUInt32NoTag(itemCountList_.getInt(i)); + if (retcode_ != 0) { + output.writeInt32(2, retcode_); } if (getItemIdListList().size() > 0) { output.writeUInt32NoTag(34); @@ -292,8 +288,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < itemIdList_.size(); i++) { output.writeUInt32NoTag(itemIdList_.getInt(i)); } - if (retcode_ != 0) { - output.writeInt32(10, retcode_); + if (getItemCountListList().size() > 0) { + output.writeUInt32NoTag(122); + output.writeUInt32NoTag(itemCountListMemoizedSerializedSize); + } + for (int i = 0; i < itemCountList_.size(); i++) { + output.writeUInt32NoTag(itemCountList_.getInt(i)); } unknownFields.writeTo(output); } @@ -304,37 +304,37 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, retcode_); + } { int dataSize = 0; - for (int i = 0; i < itemCountList_.size(); i++) { + for (int i = 0; i < itemIdList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(itemCountList_.getInt(i)); + .computeUInt32SizeNoTag(itemIdList_.getInt(i)); } size += dataSize; - if (!getItemCountListList().isEmpty()) { + if (!getItemIdListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - itemCountListMemoizedSerializedSize = dataSize; + itemIdListMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < itemIdList_.size(); i++) { + for (int i = 0; i < itemCountList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(itemIdList_.getInt(i)); + .computeUInt32SizeNoTag(itemCountList_.getInt(i)); } size += dataSize; - if (!getItemIdListList().isEmpty()) { + if (!getItemCountListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - itemIdListMemoizedSerializedSize = dataSize; - } - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, retcode_); + itemCountListMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -475,8 +475,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7572
-     * Obf: KIEBPLBPCAE
+     * CmdId: 21531
+     * obf: JBHOLOPBKPJ
      *
* * Protobuf type {@code DestroyMaterialRsp} @@ -663,7 +663,7 @@ public Builder mergeFrom( private int retcode_ ; /** - * int32 retcode = 10; + * int32 retcode = 2; * @return The retcode. */ @java.lang.Override @@ -671,7 +671,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 10; + * int32 retcode = 2; * @param value The retcode to set. * @return This builder for chaining. */ @@ -682,7 +682,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 10; + * int32 retcode = 2; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -779,7 +779,7 @@ private void ensureItemCountListIsMutable() { } } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @return A list containing the itemCountList. */ public java.util.List @@ -788,14 +788,14 @@ private void ensureItemCountListIsMutable() { java.util.Collections.unmodifiableList(itemCountList_) : itemCountList_; } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @return The count of itemCountList. */ public int getItemCountListCount() { return itemCountList_.size(); } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @param index The index of the element to return. * @return The itemCountList at the given index. */ @@ -803,7 +803,7 @@ public int getItemCountList(int index) { return itemCountList_.getInt(index); } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @param index The index to set the value at. * @param value The itemCountList to set. * @return This builder for chaining. @@ -816,7 +816,7 @@ public Builder setItemCountList( return this; } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @param value The itemCountList to add. * @return This builder for chaining. */ @@ -827,7 +827,7 @@ public Builder addItemCountList(int value) { return this; } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @param values The itemCountList to add. * @return This builder for chaining. */ @@ -840,7 +840,7 @@ public Builder addAllItemCountList( return this; } /** - * repeated uint32 item_count_list = 2; + * repeated uint32 item_count_list = 15; * @return This builder for chaining. */ public Builder clearItemCountList() { @@ -917,8 +917,8 @@ public emu.grasscutter.net.proto.DestroyMaterialRspOuterClass.DestroyMaterialRsp static { java.lang.String[] descriptorData = { "\n\030DestroyMaterialRsp.proto\"T\n\022DestroyMat" + - "erialRsp\022\017\n\007retcode\030\n \001(\005\022\024\n\014item_id_lis" + - "t\030\004 \003(\r\022\027\n\017item_count_list\030\002 \003(\rB\033\n\031emu." + + "erialRsp\022\017\n\007retcode\030\002 \001(\005\022\024\n\014item_id_lis" + + "t\030\004 \003(\r\022\027\n\017item_count_list\030\017 \003(\rB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java index 1d96141002f..0c2035fba77 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java @@ -53,6 +53,7 @@ public interface DropHintNotifyOrBuilder extends /** * 
    * CmdId: 3881
+   * obf: BNAGKNMHKEJ
    *
* * Protobuf type {@code DropHintNotify} @@ -415,6 +416,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 3881
+     * obf: BNAGKNMHKEJ
      *
* * Protobuf type {@code DropHintNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryToBeExploreNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryToBeExploreNotifyOuterClass.java index bafe2c20bda..5f37461040a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryToBeExploreNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryToBeExploreNotifyOuterClass.java @@ -19,27 +19,27 @@ public interface DungeonEntryToBeExploreNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 scene_id = 15; - * @return The sceneId. + * uint32 dungeon_entry_scene_point_id = 3; + * @return The dungeonEntryScenePointId. */ - int getSceneId(); + int getDungeonEntryScenePointId(); /** - * uint32 dungeon_entry_scene_point_id = 13; - * @return The dungeonEntryScenePointId. + * uint32 scene_id = 9; + * @return The sceneId. */ - int getDungeonEntryScenePointId(); + int getSceneId(); /** - * uint32 dungeon_entry_config_id = 5; + * uint32 dungeon_entry_config_id = 2; * @return The dungeonEntryConfigId. */ int getDungeonEntryConfigId(); } /** * 
-   * CmdId: 22366
-   * Obf: IIPOKPCHEKL
+   * CmdId: 1436
+   * obf: IDIMDHIIIPB
    *
* * Protobuf type {@code DungeonEntryToBeExploreNotify} @@ -86,17 +86,17 @@ private DungeonEntryToBeExploreNotify( case 0: done = true; break; - case 40: { + case 16: { dungeonEntryConfigId_ = input.readUInt32(); break; } - case 104: { + case 24: { dungeonEntryScenePointId_ = input.readUInt32(); break; } - case 120: { + case 72: { sceneId_ = input.readUInt32(); break; @@ -133,32 +133,32 @@ private DungeonEntryToBeExploreNotify( emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify.class, emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify.Builder.class); } - public static final int SCENE_ID_FIELD_NUMBER = 15; - private int sceneId_; + public static final int DUNGEON_ENTRY_SCENE_POINT_ID_FIELD_NUMBER = 3; + private int dungeonEntryScenePointId_; /** - * uint32 scene_id = 15; - * @return The sceneId. + * uint32 dungeon_entry_scene_point_id = 3; + * @return The dungeonEntryScenePointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getDungeonEntryScenePointId() { + return dungeonEntryScenePointId_; } - public static final int DUNGEON_ENTRY_SCENE_POINT_ID_FIELD_NUMBER = 13; - private int dungeonEntryScenePointId_; + public static final int SCENE_ID_FIELD_NUMBER = 9; + private int sceneId_; /** - * uint32 dungeon_entry_scene_point_id = 13; - * @return The dungeonEntryScenePointId. + * uint32 scene_id = 9; + * @return The sceneId. */ @java.lang.Override - public int getDungeonEntryScenePointId() { - return dungeonEntryScenePointId_; + public int getSceneId() { + return sceneId_; } - public static final int DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER = 5; + public static final int DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER = 2; private int dungeonEntryConfigId_; /** - * uint32 dungeon_entry_config_id = 5; + * uint32 dungeon_entry_config_id = 2; * @return The dungeonEntryConfigId. */ @java.lang.Override @@ -181,13 +181,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (dungeonEntryConfigId_ != 0) { - output.writeUInt32(5, dungeonEntryConfigId_); + output.writeUInt32(2, dungeonEntryConfigId_); } if (dungeonEntryScenePointId_ != 0) { - output.writeUInt32(13, dungeonEntryScenePointId_); + output.writeUInt32(3, dungeonEntryScenePointId_); } if (sceneId_ != 0) { - output.writeUInt32(15, sceneId_); + output.writeUInt32(9, sceneId_); } unknownFields.writeTo(output); } @@ -200,15 +200,15 @@ public int getSerializedSize() { size = 0; if (dungeonEntryConfigId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, dungeonEntryConfigId_); + .computeUInt32Size(2, dungeonEntryConfigId_); } if (dungeonEntryScenePointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, dungeonEntryScenePointId_); + .computeUInt32Size(3, dungeonEntryScenePointId_); } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, sceneId_); + .computeUInt32Size(9, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,10 +225,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify other = (emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify) obj; - if (getSceneId() - != other.getSceneId()) return false; if (getDungeonEntryScenePointId() != other.getDungeonEntryScenePointId()) return false; + if (getSceneId() + != other.getSceneId()) return false; if (getDungeonEntryConfigId() != other.getDungeonEntryConfigId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -242,10 +242,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; - hash = (53 * hash) + getSceneId(); hash = (37 * hash) + DUNGEON_ENTRY_SCENE_POINT_ID_FIELD_NUMBER; hash = (53 * hash) + getDungeonEntryScenePointId(); + hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSceneId(); hash = (37 * hash) + DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER; hash = (53 * hash) + getDungeonEntryConfigId(); hash = (29 * hash) + unknownFields.hashCode(); @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 22366
-     * Obf: IIPOKPCHEKL
+     * CmdId: 1436
+     * obf: IDIMDHIIIPB
      *
* * Protobuf type {@code DungeonEntryToBeExploreNotify} @@ -386,10 +386,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - sceneId_ = 0; - dungeonEntryScenePointId_ = 0; + sceneId_ = 0; + dungeonEntryConfigId_ = 0; return this; @@ -418,8 +418,8 @@ public emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.Dungeon @java.lang.Override public emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify buildPartial() { emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify result = new emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify(this); - result.sceneId_ = sceneId_; result.dungeonEntryScenePointId_ = dungeonEntryScenePointId_; + result.sceneId_ = sceneId_; result.dungeonEntryConfigId_ = dungeonEntryConfigId_; onBuilt(); return result; @@ -469,12 +469,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify other) { if (other == emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.DungeonEntryToBeExploreNotify.getDefaultInstance()) return this; - if (other.getSceneId() != 0) { - setSceneId(other.getSceneId()); - } if (other.getDungeonEntryScenePointId() != 0) { setDungeonEntryScenePointId(other.getDungeonEntryScenePointId()); } + if (other.getSceneId() != 0) { + setSceneId(other.getSceneId()); + } if (other.getDungeonEntryConfigId() != 0) { setDungeonEntryConfigId(other.getDungeonEntryConfigId()); } @@ -507,71 +507,71 @@ public Builder mergeFrom( return this; } - private int sceneId_ ; + private int dungeonEntryScenePointId_ ; /** - * uint32 scene_id = 15; - * @return The sceneId. + * uint32 dungeon_entry_scene_point_id = 3; + * @return The dungeonEntryScenePointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getDungeonEntryScenePointId() { + return dungeonEntryScenePointId_; } /** - * uint32 scene_id = 15; - * @param value The sceneId to set. + * uint32 dungeon_entry_scene_point_id = 3; + * @param value The dungeonEntryScenePointId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setDungeonEntryScenePointId(int value) { - sceneId_ = value; + dungeonEntryScenePointId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 15; + * uint32 dungeon_entry_scene_point_id = 3; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearDungeonEntryScenePointId() { - sceneId_ = 0; + dungeonEntryScenePointId_ = 0; onChanged(); return this; } - private int dungeonEntryScenePointId_ ; + private int sceneId_ ; /** - * uint32 dungeon_entry_scene_point_id = 13; - * @return The dungeonEntryScenePointId. + * uint32 scene_id = 9; + * @return The sceneId. */ @java.lang.Override - public int getDungeonEntryScenePointId() { - return dungeonEntryScenePointId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 dungeon_entry_scene_point_id = 13; - * @param value The dungeonEntryScenePointId to set. + * uint32 scene_id = 9; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setDungeonEntryScenePointId(int value) { + public Builder setSceneId(int value) { - dungeonEntryScenePointId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 dungeon_entry_scene_point_id = 13; + * uint32 scene_id = 9; * @return This builder for chaining. */ - public Builder clearDungeonEntryScenePointId() { + public Builder clearSceneId() { - dungeonEntryScenePointId_ = 0; + sceneId_ = 0; onChanged(); return this; } private int dungeonEntryConfigId_ ; /** - * uint32 dungeon_entry_config_id = 5; + * uint32 dungeon_entry_config_id = 2; * @return The dungeonEntryConfigId. */ @java.lang.Override @@ -579,7 +579,7 @@ public int getDungeonEntryConfigId() { return dungeonEntryConfigId_; } /** - * uint32 dungeon_entry_config_id = 5; + * uint32 dungeon_entry_config_id = 2; * @param value The dungeonEntryConfigId to set. * @return This builder for chaining. */ @@ -590,7 +590,7 @@ public Builder setDungeonEntryConfigId(int value) { return this; } /** - * uint32 dungeon_entry_config_id = 5; + * uint32 dungeon_entry_config_id = 2; * @return This builder for chaining. */ public Builder clearDungeonEntryConfigId() { @@ -667,9 +667,9 @@ public emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.Dungeon static { java.lang.String[] descriptorData = { "\n#DungeonEntryToBeExploreNotify.proto\"x\n" + - "\035DungeonEntryToBeExploreNotify\022\020\n\010scene_" + - "id\030\017 \001(\r\022$\n\034dungeon_entry_scene_point_id" + - "\030\r \001(\r\022\037\n\027dungeon_entry_config_id\030\005 \001(\rB" + + "\035DungeonEntryToBeExploreNotify\022$\n\034dungeo" + + "n_entry_scene_point_id\030\003 \001(\r\022\020\n\010scene_id" + + "\030\t \001(\r\022\037\n\027dungeon_entry_config_id\030\002 \001(\rB" + "\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +681,7 @@ public emu.grasscutter.net.proto.DungeonEntryToBeExploreNotifyOuterClass.Dungeon internal_static_DungeonEntryToBeExploreNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonEntryToBeExploreNotify_descriptor, - new java.lang.String[] { "SceneId", "DungeonEntryScenePointId", "DungeonEntryConfigId", }); + new java.lang.String[] { "DungeonEntryScenePointId", "SceneId", "DungeonEntryConfigId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonPlayerDieReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonPlayerDieReqOuterClass.java index 716e66362ab..cf35352c11a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonPlayerDieReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonPlayerDieReqOuterClass.java @@ -19,26 +19,26 @@ public interface DungeonPlayerDieReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @return The enum numeric value on the wire for dieType. */ int getDieTypeValue(); /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @return The dieType. */ emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType(); /** - * uint32 dungeon_id = 1; + * uint32 dungeon_id = 11; * @return The dungeonId. */ int getDungeonId(); } /** * 
-   * CmdId: 3239
-   * Obf: KLKMLEAJHNH
+   * CmdId: 23261
+   * obf: OEINPDDPGEJ
    *
* * Protobuf type {@code DungeonPlayerDieReq} @@ -86,12 +86,12 @@ private DungeonPlayerDieReq( case 0: done = true; break; - case 8: { + case 88: { dungeonId_ = input.readUInt32(); break; } - case 16: { + case 104: { int rawValue = input.readEnum(); dieType_ = rawValue; @@ -129,17 +129,17 @@ private DungeonPlayerDieReq( emu.grasscutter.net.proto.DungeonPlayerDieReqOuterClass.DungeonPlayerDieReq.class, emu.grasscutter.net.proto.DungeonPlayerDieReqOuterClass.DungeonPlayerDieReq.Builder.class); } - public static final int DIE_TYPE_FIELD_NUMBER = 2; + public static final int DIE_TYPE_FIELD_NUMBER = 13; private int dieType_; /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @return The enum numeric value on the wire for dieType. */ @java.lang.Override public int getDieTypeValue() { return dieType_; } /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @return The dieType. */ @java.lang.Override public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() { @@ -148,10 +148,10 @@ private DungeonPlayerDieReq( return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result; } - public static final int DUNGEON_ID_FIELD_NUMBER = 1; + public static final int DUNGEON_ID_FIELD_NUMBER = 11; private int dungeonId_; /** - * uint32 dungeon_id = 1; + * uint32 dungeon_id = 11; * @return The dungeonId. */ @java.lang.Override @@ -174,10 +174,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (dungeonId_ != 0) { - output.writeUInt32(1, dungeonId_); + output.writeUInt32(11, dungeonId_); } if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) { - output.writeEnum(2, dieType_); + output.writeEnum(13, dieType_); } unknownFields.writeTo(output); } @@ -190,11 +190,11 @@ public int getSerializedSize() { size = 0; if (dungeonId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, dungeonId_); + .computeUInt32Size(11, dungeonId_); } if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(2, dieType_); + .computeEnumSize(13, dieType_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -326,8 +326,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 3239
-     * Obf: KLKMLEAJHNH
+     * CmdId: 23261
+     * obf: OEINPDDPGEJ
      *
* * Protobuf type {@code DungeonPlayerDieReq} @@ -484,14 +484,14 @@ public Builder mergeFrom( private int dieType_ = 0; /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @return The enum numeric value on the wire for dieType. */ @java.lang.Override public int getDieTypeValue() { return dieType_; } /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @param value The enum numeric value on the wire for dieType to set. * @return This builder for chaining. */ @@ -502,7 +502,7 @@ public Builder setDieTypeValue(int value) { return this; } /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @return The dieType. */ @java.lang.Override @@ -512,7 +512,7 @@ public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieTyp return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result; } /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @param value The dieType to set. * @return This builder for chaining. */ @@ -526,7 +526,7 @@ public Builder setDieType(emu.grasscutter.net.proto.PlayerDieTypeOuterClass.Play return this; } /** - * .PlayerDieType die_type = 2; + * .PlayerDieType die_type = 13; * @return This builder for chaining. */ public Builder clearDieType() { @@ -538,7 +538,7 @@ public Builder clearDieType() { private int dungeonId_ ; /** - * uint32 dungeon_id = 1; + * uint32 dungeon_id = 11; * @return The dungeonId. */ @java.lang.Override @@ -546,7 +546,7 @@ public int getDungeonId() { return dungeonId_; } /** - * uint32 dungeon_id = 1; + * uint32 dungeon_id = 11; * @param value The dungeonId to set. * @return This builder for chaining. */ @@ -557,7 +557,7 @@ public Builder setDungeonId(int value) { return this; } /** - * uint32 dungeon_id = 1; + * uint32 dungeon_id = 11; * @return This builder for chaining. */ public Builder clearDungeonId() { @@ -635,8 +635,8 @@ public emu.grasscutter.net.proto.DungeonPlayerDieReqOuterClass.DungeonPlayerDieR java.lang.String[] descriptorData = { "\n\031DungeonPlayerDieReq.proto\032\023PlayerDieTy" + "pe.proto\"K\n\023DungeonPlayerDieReq\022 \n\010die_t" + - "ype\030\002 \001(\0162\016.PlayerDieType\022\022\n\ndungeon_id\030" + - "\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + + "ype\030\r \001(\0162\016.PlayerDieType\022\022\n\ndungeon_id\030" + + "\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonRestartRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonRestartRspOuterClass.java index dc1d500364b..61cdea9f2ca 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonRestartRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonRestartRspOuterClass.java @@ -25,21 +25,21 @@ public interface DungeonRestartRspOrBuilder extends int getDungeonId(); /** - * uint32 point_id = 4; - * @return The pointId. + * int32 retcode = 2; + * @return The retcode. */ - int getPointId(); + int getRetcode(); /** - * int32 retcode = 15; - * @return The retcode. + * uint32 point_id = 13; + * @return The pointId. */ - int getRetcode(); + int getPointId(); } /** * 
-   * CmdId: 26758
-   * Obf: LNDDFOIDFOI
+   * CmdId: 2128
+   * obf: DBFAKCIGNJM
    *
* * Protobuf type {@code DungeonRestartRsp} @@ -91,14 +91,14 @@ private DungeonRestartRsp( dungeonId_ = input.readUInt32(); break; } - case 32: { + case 16: { - pointId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 120: { + case 104: { - retcode_ = input.readInt32(); + pointId_ = input.readUInt32(); break; } default: { @@ -144,26 +144,26 @@ public int getDungeonId() { return dungeonId_; } - public static final int POINT_ID_FIELD_NUMBER = 4; - private int pointId_; + public static final int RETCODE_FIELD_NUMBER = 2; + private int retcode_; /** - * uint32 point_id = 4; - * @return The pointId. + * int32 retcode = 2; + * @return The retcode. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getRetcode() { + return retcode_; } - public static final int RETCODE_FIELD_NUMBER = 15; - private int retcode_; + public static final int POINT_ID_FIELD_NUMBER = 13; + private int pointId_; /** - * int32 retcode = 15; - * @return The retcode. + * uint32 point_id = 13; + * @return The pointId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getPointId() { + return pointId_; } private byte memoizedIsInitialized = -1; @@ -183,11 +183,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (dungeonId_ != 0) { output.writeUInt32(1, dungeonId_); } - if (pointId_ != 0) { - output.writeUInt32(4, pointId_); - } if (retcode_ != 0) { - output.writeInt32(15, retcode_); + output.writeInt32(2, retcode_); + } + if (pointId_ != 0) { + output.writeUInt32(13, pointId_); } unknownFields.writeTo(output); } @@ -202,13 +202,13 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(1, dungeonId_); } - if (pointId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, pointId_); + .computeInt32Size(2, retcode_); } - if (retcode_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(15, retcode_); + .computeUInt32Size(13, pointId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -227,10 +227,10 @@ public boolean equals(final java.lang.Object obj) { if (getDungeonId() != other.getDungeonId()) return false; - if (getPointId() - != other.getPointId()) return false; if (getRetcode() != other.getRetcode()) return false; + if (getPointId() + != other.getPointId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -244,10 +244,10 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER; hash = (53 * hash) + getDungeonId(); - hash = (37 * hash) + POINT_ID_FIELD_NUMBER; - hash = (53 * hash) + getPointId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + POINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getPointId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 26758
-     * Obf: LNDDFOIDFOI
+     * CmdId: 2128
+     * obf: DBFAKCIGNJM
      *
* * Protobuf type {@code DungeonRestartRsp} @@ -388,10 +388,10 @@ public Builder clear() { super.clear(); dungeonId_ = 0; - pointId_ = 0; - retcode_ = 0; + pointId_ = 0; + return this; } @@ -419,8 +419,8 @@ public emu.grasscutter.net.proto.DungeonRestartRspOuterClass.DungeonRestartRsp b public emu.grasscutter.net.proto.DungeonRestartRspOuterClass.DungeonRestartRsp buildPartial() { emu.grasscutter.net.proto.DungeonRestartRspOuterClass.DungeonRestartRsp result = new emu.grasscutter.net.proto.DungeonRestartRspOuterClass.DungeonRestartRsp(this); result.dungeonId_ = dungeonId_; - result.pointId_ = pointId_; result.retcode_ = retcode_; + result.pointId_ = pointId_; onBuilt(); return result; } @@ -472,12 +472,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.DungeonRestartRspOuterClass.D if (other.getDungeonId() != 0) { setDungeonId(other.getDungeonId()); } - if (other.getPointId() != 0) { - setPointId(other.getPointId()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } + if (other.getPointId() != 0) { + setPointId(other.getPointId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -538,64 +538,64 @@ public Builder clearDungeonId() { return this; } - private int pointId_ ; + private int retcode_ ; /** - * uint32 point_id = 4; - * @return The pointId. + * int32 retcode = 2; + * @return The retcode. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getRetcode() { + return retcode_; } /** - * uint32 point_id = 4; - * @param value The pointId to set. + * int32 retcode = 2; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setPointId(int value) { + public Builder setRetcode(int value) { - pointId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 point_id = 4; + * int32 retcode = 2; * @return This builder for chaining. */ - public Builder clearPointId() { + public Builder clearRetcode() { - pointId_ = 0; + retcode_ = 0; onChanged(); return this; } - private int retcode_ ; + private int pointId_ ; /** - * int32 retcode = 15; - * @return The retcode. + * uint32 point_id = 13; + * @return The pointId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getPointId() { + return pointId_; } /** - * int32 retcode = 15; - * @param value The retcode to set. + * uint32 point_id = 13; + * @param value The pointId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setPointId(int value) { - retcode_ = value; + pointId_ = value; onChanged(); return this; } /** - * int32 retcode = 15; + * uint32 point_id = 13; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearPointId() { - retcode_ = 0; + pointId_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.DungeonRestartRspOuterClass.DungeonRestartRsp g static { java.lang.String[] descriptorData = { "\n\027DungeonRestartRsp.proto\"J\n\021DungeonRest" + - "artRsp\022\022\n\ndungeon_id\030\001 \001(\r\022\020\n\010point_id\030\004" + - " \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.grasscutter" + + "artRsp\022\022\n\ndungeon_id\030\001 \001(\r\022\017\n\007retcode\030\002 " + + "\001(\005\022\020\n\010point_id\030\r \001(\rB\033\n\031emu.grasscutter" + ".net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.DungeonRestartRspOuterClass.DungeonRestartRsp g internal_static_DungeonRestartRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonRestartRsp_descriptor, - new java.lang.String[] { "DungeonId", "PointId", "Retcode", }); + new java.lang.String[] { "DungeonId", "Retcode", "PointId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleExhibitionInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleExhibitionInfoOuterClass.java index dcf3c47fdfb..ca342f54bf9 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleExhibitionInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleExhibitionInfoOuterClass.java @@ -58,11 +58,6 @@ emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfoO int index); } /** - * 
-   * 5.0.0
-   * CmdId: 
-   *
- * * Protobuf type {@code DungeonSettleExhibitionInfo} */ public static final class DungeonSettleExhibitionInfo extends @@ -406,11 +401,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * 5.0.0
-     * CmdId: 
-     *
- * * Protobuf type {@code DungeonSettleExhibitionInfo} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleNotifyOuterClass.java index 10ee443b810..4db9c6eea9d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleNotifyOuterClass.java @@ -163,6 +163,138 @@ emu.grasscutter.net.proto.ParamListOuterClass.ParamList getSettleShowOrThrow( */ int getResult(); + /** + * 
+     * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+     *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + * @return Whether the summerTimeV2DungeonSettleInfo field is set. + */ + boolean hasSummerTimeV2DungeonSettleInfo(); + /** + * 
+     * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+     *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + * @return The summerTimeV2DungeonSettleInfo. + */ + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo getSummerTimeV2DungeonSettleInfo(); + /** + * 
+     * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+     *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + */ + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder getSummerTimeV2DungeonSettleInfoOrBuilder(); + + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + * @return Whether the bladeDanceSettleInfo field is set. + */ + boolean hasBladeDanceSettleInfo(); + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + * @return The bladeDanceSettleInfo. + */ + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo getBladeDanceSettleInfo(); + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + */ + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder getBladeDanceSettleInfoOrBuilder(); + + /** + * 
+     * NJHEGCCDBBC recharge_disk_settle_info = 175;
+     * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+     * FCCEFPNFMBH mist_trial_settle_info = 199;
+     * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+     *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + * @return Whether the effigyChallengeV2SettleInfo field is set. + */ + boolean hasEffigyChallengeV2SettleInfo(); + /** + * 
+     * NJHEGCCDBBC recharge_disk_settle_info = 175;
+     * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+     * FCCEFPNFMBH mist_trial_settle_info = 199;
+     * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+     *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + * @return The effigyChallengeV2SettleInfo. + */ + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo getEffigyChallengeV2SettleInfo(); + /** + * 
+     * NJHEGCCDBBC recharge_disk_settle_info = 175;
+     * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+     * FCCEFPNFMBH mist_trial_settle_info = 199;
+     * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+     *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder getEffigyChallengeV2SettleInfoOrBuilder(); + + /** + * 
+     * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+     *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + * @return Whether the channellerSlabLoopDungeonResultInfo field is set. + */ + boolean hasChannellerSlabLoopDungeonResultInfo(); + /** + * 
+     * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+     *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + * @return The channellerSlabLoopDungeonResultInfo. + */ + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo(); + /** + * 
+     * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+     *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder(); + + /** + * 
+     * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+     *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + * @return Whether the roguelikeDungeonSettleInfo field is set. + */ + boolean hasRoguelikeDungeonSettleInfo(); + /** + * 
+     * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+     *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + * @return The roguelikeDungeonSettleInfo. + */ + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo getRoguelikeDungeonSettleInfo(); + /** + * 
+     * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+     *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder getRoguelikeDungeonSettleInfoOrBuilder(); + /** * .TowerLevelEndNotify tower_level_end_notify = 682; * @return Whether the towerLevelEndNotify field is set. @@ -178,6 +310,183 @@ emu.grasscutter.net.proto.ParamListOuterClass.ParamList getSettleShowOrThrow( */ emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder getTowerLevelEndNotifyOrBuilder(); + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + * @return Whether the crystalLinkSettleInfo field is set. + */ + boolean hasCrystalLinkSettleInfo(); + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + * @return The crystalLinkSettleInfo. + */ + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo getCrystalLinkSettleInfo(); + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder getCrystalLinkSettleInfoOrBuilder(); + + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + * @return Whether the instableSpraySettleInfo field is set. + */ + boolean hasInstableSpraySettleInfo(); + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + * @return The instableSpraySettleInfo. + */ + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo getInstableSpraySettleInfo(); + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder getInstableSpraySettleInfoOrBuilder(); + + /** + * 
+     * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+     * KEHHNNDNEOO bullet_hell_settle_info = 881;
+     *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + * @return Whether the fungusFighterV2SettleInfo field is set. + */ + boolean hasFungusFighterV2SettleInfo(); + /** + * 
+     * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+     * KEHHNNDNEOO bullet_hell_settle_info = 881;
+     *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + * @return The fungusFighterV2SettleInfo. + */ + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo getFungusFighterV2SettleInfo(); + /** + * 
+     * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+     * KEHHNNDNEOO bullet_hell_settle_info = 881;
+     *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder getFungusFighterV2SettleInfoOrBuilder(); + + /** + * 
+     * BGCJFMNOONB goal_challenge_settle_info = 1051;
+     * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+     * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+     *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + * @return Whether the effigyChallengeDungeonResultInfo field is set. + */ + boolean hasEffigyChallengeDungeonResultInfo(); + /** + * 
+     * BGCJFMNOONB goal_challenge_settle_info = 1051;
+     * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+     * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+     *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + * @return The effigyChallengeDungeonResultInfo. + */ + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo(); + /** + * 
+     * BGCJFMNOONB goal_challenge_settle_info = 1051;
+     * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+     * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+     *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder(); + + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + * @return Whether the multiCharacterDungeonSettleInfo field is set. + */ + boolean hasMultiCharacterDungeonSettleInfo(); + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + * @return The multiCharacterDungeonSettleInfo. + */ + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo getMultiCharacterDungeonSettleInfo(); + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder getMultiCharacterDungeonSettleInfoOrBuilder(); + + /** + * 
+     * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+     *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; + * @return Whether the teamChainSettleInfo field is set. + */ + boolean hasTeamChainSettleInfo(); + /** + * 
+     * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+     *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; + * @return The teamChainSettleInfo. + */ + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo getTeamChainSettleInfo(); + /** + * 
+     * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+     *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; + */ + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder getTeamChainSettleInfoOrBuilder(); + + /** + * 
+     * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+     * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+     * BPKPOIKNJKI role_combat_settle_info = 1461;
+     * FJHBJODAPMI char_master_settle_info = 1497;
+     * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+     * PBODMIJNHPG slime_cannon_settle_info = 1660;
+     *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; + * @return Whether the windFieldDungeonSettleInfo field is set. + */ + boolean hasWindFieldDungeonSettleInfo(); + /** + * 
+     * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+     * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+     * BPKPOIKNJKI role_combat_settle_info = 1461;
+     * FJHBJODAPMI char_master_settle_info = 1497;
+     * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+     * PBODMIJNHPG slime_cannon_settle_info = 1660;
+     *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; + * @return The windFieldDungeonSettleInfo. + */ + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo getWindFieldDungeonSettleInfo(); + /** + * 
+     * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+     * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+     * BPKPOIKNJKI role_combat_settle_info = 1461;
+     * FJHBJODAPMI char_master_settle_info = 1497;
+     * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+     * PBODMIJNHPG slime_cannon_settle_info = 1660;
+     *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; + */ + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder getWindFieldDungeonSettleInfoOrBuilder(); + /** * .TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922; * @return Whether the trialAvatarFirstPassDungeonNotify field is set. @@ -193,9 +502,40 @@ emu.grasscutter.net.proto.ParamListOuterClass.ParamList getSettleShowOrThrow( */ emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotifyOrBuilder getTrialAvatarFirstPassDungeonNotifyOrBuilder(); + /** + * 
+     * JBIMMJPOEBA gain_buff_settle_info = 2002;
+     *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + * @return Whether the pacmanSettleInfo field is set. + */ + boolean hasPacmanSettleInfo(); + /** + * 
+     * JBIMMJPOEBA gain_buff_settle_info = 2002;
+     *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + * @return The pacmanSettleInfo. + */ + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo getPacmanSettleInfo(); + /** + * 
+     * JBIMMJPOEBA gain_buff_settle_info = 2002;
+     *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder getPacmanSettleInfoOrBuilder(); + public emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify.DetailCase getDetailCase(); } /** + * 
+   * CmdId: 8007
+   *
+ * * Protobuf type {@code DungeonSettleNotify} */ public static final class DungeonSettleNotify extends @@ -329,6 +669,76 @@ private DungeonSettleNotify( result_ = input.readUInt32(); break; } + case 1298: { + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder subBuilder = null; + if (detailCase_ == 162) { + subBuilder = ((emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 162; + break; + } + case 1314: { + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder subBuilder = null; + if (detailCase_ == 164) { + subBuilder = ((emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 164; + break; + } + case 1946: { + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder subBuilder = null; + if (detailCase_ == 243) { + subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 243; + break; + } + case 2202: { + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder subBuilder = null; + if (detailCase_ == 275) { + subBuilder = ((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 275; + break; + } + case 4938: { + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder subBuilder = null; + if (detailCase_ == 617) { + subBuilder = ((emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 617; + break; + } case 5458: { emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder subBuilder = null; if (detailCase_ == 682) { @@ -343,6 +753,104 @@ private DungeonSettleNotify( detailCase_ = 682; break; } + case 5690: { + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder subBuilder = null; + if (detailCase_ == 711) { + subBuilder = ((emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 711; + break; + } + case 5906: { + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder subBuilder = null; + if (detailCase_ == 738) { + subBuilder = ((emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 738; + break; + } + case 8034: { + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder subBuilder = null; + if (detailCase_ == 1004) { + subBuilder = ((emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 1004; + break; + } + case 9490: { + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder subBuilder = null; + if (detailCase_ == 1186) { + subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 1186; + break; + } + case 9610: { + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder subBuilder = null; + if (detailCase_ == 1201) { + subBuilder = ((emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 1201; + break; + } + case 9738: { + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder subBuilder = null; + if (detailCase_ == 1217) { + subBuilder = ((emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 1217; + break; + } + case 13482: { + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder subBuilder = null; + if (detailCase_ == 1685) { + subBuilder = ((emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 1685; + break; + } case 15378: { emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.Builder subBuilder = null; if (detailCase_ == 1922) { @@ -357,6 +865,20 @@ private DungeonSettleNotify( detailCase_ = 1922; break; } + case 15762: { + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder subBuilder = null; + if (detailCase_ == 1970) { + subBuilder = ((emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_).toBuilder(); + } + detail_ = + input.readMessage(emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom((emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_); + detail_ = subBuilder.buildPartial(); + } + detailCase_ = 1970; + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -414,8 +936,21 @@ protected com.google.protobuf.MapField internalGetMapField( public enum DetailCase implements com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { + SUMMER_TIME_V_2_DUNGEON_SETTLE_INFO(162), + BLADE_DANCE_SETTLE_INFO(164), + EFFIGY_CHALLENGE_V_2_SETTLE_INFO(243), + CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO(275), + ROGUELIKE_DUNGEON_SETTLE_INFO(617), TOWER_LEVEL_END_NOTIFY(682), + CRYSTAL_LINK_SETTLE_INFO(711), + INSTABLE_SPRAY_SETTLE_INFO(738), + FUNGUS_FIGHTER_V_2_SETTLE_INFO(1004), + EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO(1186), + MULTI_CHARACTER_DUNGEON_SETTLE_INFO(1201), + TEAM_CHAIN_SETTLE_INFO(1217), + WIND_FIELD_DUNGEON_SETTLE_INFO(1685), TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY(1922), + PACMAN_SETTLE_INFO(1970), DETAIL_NOT_SET(0); private final int value; private DetailCase(int value) { @@ -433,8 +968,21 @@ public static DetailCase valueOf(int value) { public static DetailCase forNumber(int value) { switch (value) { + case 162: return SUMMER_TIME_V_2_DUNGEON_SETTLE_INFO; + case 164: return BLADE_DANCE_SETTLE_INFO; + case 243: return EFFIGY_CHALLENGE_V_2_SETTLE_INFO; + case 275: return CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO; + case 617: return ROGUELIKE_DUNGEON_SETTLE_INFO; case 682: return TOWER_LEVEL_END_NOTIFY; + case 711: return CRYSTAL_LINK_SETTLE_INFO; + case 738: return INSTABLE_SPRAY_SETTLE_INFO; + case 1004: return FUNGUS_FIGHTER_V_2_SETTLE_INFO; + case 1186: return EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO; + case 1201: return MULTI_CHARACTER_DUNGEON_SETTLE_INFO; + case 1217: return TEAM_CHAIN_SETTLE_INFO; + case 1685: return WIND_FIELD_DUNGEON_SETTLE_INFO; case 1922: return TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY; + case 1970: return PACMAN_SETTLE_INFO; case 0: return DETAIL_NOT_SET; default: return null; } @@ -746,98 +1294,642 @@ public int getResult() { return result_; } - public static final int TOWER_LEVEL_END_NOTIFY_FIELD_NUMBER = 682; + public static final int SUMMER_TIME_V_2_DUNGEON_SETTLE_INFO_FIELD_NUMBER = 162; /** - * .TowerLevelEndNotify tower_level_end_notify = 682; - * @return Whether the towerLevelEndNotify field is set. + * 
+     * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+     *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + * @return Whether the summerTimeV2DungeonSettleInfo field is set. */ @java.lang.Override - public boolean hasTowerLevelEndNotify() { - return detailCase_ == 682; + public boolean hasSummerTimeV2DungeonSettleInfo() { + return detailCase_ == 162; } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; - * @return The towerLevelEndNotify. + * 
+     * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+     *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + * @return The summerTimeV2DungeonSettleInfo. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify getTowerLevelEndNotify() { - if (detailCase_ == 682) { - return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_; + public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo getSummerTimeV2DungeonSettleInfo() { + if (detailCase_ == 162) { + return (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_; } - return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance(); } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; + * 
+     * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+     *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder getTowerLevelEndNotifyOrBuilder() { - if (detailCase_ == 682) { - return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_; + public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder getSummerTimeV2DungeonSettleInfoOrBuilder() { + if (detailCase_ == 162) { + return (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_; } - return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance(); } - public static final int TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY_FIELD_NUMBER = 1922; + public static final int BLADE_DANCE_SETTLE_INFO_FIELD_NUMBER = 164; /** - * .TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922; - * @return Whether the trialAvatarFirstPassDungeonNotify field is set. + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + * @return Whether the bladeDanceSettleInfo field is set. */ @java.lang.Override - public boolean hasTrialAvatarFirstPassDungeonNotify() { - return detailCase_ == 1922; + public boolean hasBladeDanceSettleInfo() { + return detailCase_ == 164; } /** - * .TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922; - * @return The trialAvatarFirstPassDungeonNotify. + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + * @return The bladeDanceSettleInfo. */ @java.lang.Override - public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify getTrialAvatarFirstPassDungeonNotify() { - if (detailCase_ == 1922) { - return (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_; + public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo getBladeDanceSettleInfo() { + if (detailCase_ == 164) { + return (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_; } - return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance(); + return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance(); } /** - * .TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922; + * .BladeDanceSettleInfo blade_dance_settle_info = 164; */ @java.lang.Override - public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotifyOrBuilder getTrialAvatarFirstPassDungeonNotifyOrBuilder() { - if (detailCase_ == 1922) { - return (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_; + public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder getBladeDanceSettleInfoOrBuilder() { + if (detailCase_ == 164) { + return (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_; } - return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance(); + return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance(); } - private byte memoizedIsInitialized = -1; + public static final int EFFIGY_CHALLENGE_V_2_SETTLE_INFO_FIELD_NUMBER = 243; + /** + * 
+     * NJHEGCCDBBC recharge_disk_settle_info = 175;
+     * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+     * FCCEFPNFMBH mist_trial_settle_info = 199;
+     * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+     *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + * @return Whether the effigyChallengeV2SettleInfo field is set. + */ @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; + public boolean hasEffigyChallengeV2SettleInfo() { + return detailCase_ == 243; } - + /** + * 
+     * NJHEGCCDBBC recharge_disk_settle_info = 175;
+     * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+     * FCCEFPNFMBH mist_trial_settle_info = 199;
+     * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+     *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + * @return The effigyChallengeV2SettleInfo. + */ @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - com.google.protobuf.GeneratedMessageV3 - .serializeIntegerMapTo( - output, - internalGetStrengthenPointDataMap(), - StrengthenPointDataMapDefaultEntryHolder.defaultEntry, - 1); - if (isSuccess_ != false) { - output.writeBool(4, isSuccess_); + public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo getEffigyChallengeV2SettleInfo() { + if (detailCase_ == 243) { + return (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_; } - if (getFailCondListList().size() > 0) { - output.writeUInt32NoTag(42); - output.writeUInt32NoTag(failCondListMemoizedSerializedSize); + return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance(); + } + /** + * 
+     * NJHEGCCDBBC recharge_disk_settle_info = 175;
+     * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+     * FCCEFPNFMBH mist_trial_settle_info = 199;
+     * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+     *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder getEffigyChallengeV2SettleInfoOrBuilder() { + if (detailCase_ == 243) { + return (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_; } - for (int i = 0; i < failCondList_.size(); i++) { - output.writeUInt32NoTag(failCondList_.getInt(i)); + return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance(); + } + + public static final int CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER = 275; + /** + * 
+     * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+     *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + * @return Whether the channellerSlabLoopDungeonResultInfo field is set. + */ + @java.lang.Override + public boolean hasChannellerSlabLoopDungeonResultInfo() { + return detailCase_ == 275; + } + /** + * 
+     * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+     *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + * @return The channellerSlabLoopDungeonResultInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() { + if (detailCase_ == 275) { + return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + } + /** + * 
+     * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+     *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() { + if (detailCase_ == 275) { + return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + } + + public static final int ROGUELIKE_DUNGEON_SETTLE_INFO_FIELD_NUMBER = 617; + /** + * 
+     * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+     *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + * @return Whether the roguelikeDungeonSettleInfo field is set. + */ + @java.lang.Override + public boolean hasRoguelikeDungeonSettleInfo() { + return detailCase_ == 617; + } + /** + * 
+     * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+     *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + * @return The roguelikeDungeonSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo getRoguelikeDungeonSettleInfo() { + if (detailCase_ == 617) { + return (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance(); + } + /** + * 
+     * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+     *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + @java.lang.Override + public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder getRoguelikeDungeonSettleInfoOrBuilder() { + if (detailCase_ == 617) { + return (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance(); + } + + public static final int TOWER_LEVEL_END_NOTIFY_FIELD_NUMBER = 682; + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + * @return Whether the towerLevelEndNotify field is set. + */ + @java.lang.Override + public boolean hasTowerLevelEndNotify() { + return detailCase_ == 682; + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + * @return The towerLevelEndNotify. + */ + @java.lang.Override + public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify getTowerLevelEndNotify() { + if (detailCase_ == 682) { + return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_; + } + return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + */ + @java.lang.Override + public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder getTowerLevelEndNotifyOrBuilder() { + if (detailCase_ == 682) { + return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_; + } + return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + } + + public static final int CRYSTAL_LINK_SETTLE_INFO_FIELD_NUMBER = 711; + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + * @return Whether the crystalLinkSettleInfo field is set. + */ + @java.lang.Override + public boolean hasCrystalLinkSettleInfo() { + return detailCase_ == 711; + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + * @return The crystalLinkSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo getCrystalLinkSettleInfo() { + if (detailCase_ == 711) { + return (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance(); + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + @java.lang.Override + public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder getCrystalLinkSettleInfoOrBuilder() { + if (detailCase_ == 711) { + return (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance(); + } + + public static final int INSTABLE_SPRAY_SETTLE_INFO_FIELD_NUMBER = 738; + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + * @return Whether the instableSpraySettleInfo field is set. + */ + @java.lang.Override + public boolean hasInstableSpraySettleInfo() { + return detailCase_ == 738; + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + * @return The instableSpraySettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo getInstableSpraySettleInfo() { + if (detailCase_ == 738) { + return (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance(); + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + @java.lang.Override + public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder getInstableSpraySettleInfoOrBuilder() { + if (detailCase_ == 738) { + return (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance(); + } + + public static final int FUNGUS_FIGHTER_V_2_SETTLE_INFO_FIELD_NUMBER = 1004; + /** + * 
+     * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+     * KEHHNNDNEOO bullet_hell_settle_info = 881;
+     *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + * @return Whether the fungusFighterV2SettleInfo field is set. + */ + @java.lang.Override + public boolean hasFungusFighterV2SettleInfo() { + return detailCase_ == 1004; + } + /** + * 
+     * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+     * KEHHNNDNEOO bullet_hell_settle_info = 881;
+     *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + * @return The fungusFighterV2SettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo getFungusFighterV2SettleInfo() { + if (detailCase_ == 1004) { + return (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_; + } + return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance(); + } + /** + * 
+     * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+     * KEHHNNDNEOO bullet_hell_settle_info = 881;
+     *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder getFungusFighterV2SettleInfoOrBuilder() { + if (detailCase_ == 1004) { + return (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_; + } + return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance(); + } + + public static final int EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER = 1186; + /** + * 
+     * BGCJFMNOONB goal_challenge_settle_info = 1051;
+     * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+     * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+     *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + * @return Whether the effigyChallengeDungeonResultInfo field is set. + */ + @java.lang.Override + public boolean hasEffigyChallengeDungeonResultInfo() { + return detailCase_ == 1186; + } + /** + * 
+     * BGCJFMNOONB goal_challenge_settle_info = 1051;
+     * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+     * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+     *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + * @return The effigyChallengeDungeonResultInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() { + if (detailCase_ == 1186) { + return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + } + /** + * 
+     * BGCJFMNOONB goal_challenge_settle_info = 1051;
+     * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+     * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+     *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() { + if (detailCase_ == 1186) { + return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + } + + public static final int MULTI_CHARACTER_DUNGEON_SETTLE_INFO_FIELD_NUMBER = 1201; + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + * @return Whether the multiCharacterDungeonSettleInfo field is set. + */ + @java.lang.Override + public boolean hasMultiCharacterDungeonSettleInfo() { + return detailCase_ == 1201; + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + * @return The multiCharacterDungeonSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo getMultiCharacterDungeonSettleInfo() { + if (detailCase_ == 1201) { + return (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance(); + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + @java.lang.Override + public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder getMultiCharacterDungeonSettleInfoOrBuilder() { + if (detailCase_ == 1201) { + return (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance(); + } + + public static final int TEAM_CHAIN_SETTLE_INFO_FIELD_NUMBER = 1217; + /** + * 
+     * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+     *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; + * @return Whether the teamChainSettleInfo field is set. + */ + @java.lang.Override + public boolean hasTeamChainSettleInfo() { + return detailCase_ == 1217; + } + /** + * 
+     * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+     *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; + * @return The teamChainSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo getTeamChainSettleInfo() { + if (detailCase_ == 1217) { + return (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_; + } + return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance(); + } + /** + * 
+     * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+     *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; + */ + @java.lang.Override + public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder getTeamChainSettleInfoOrBuilder() { + if (detailCase_ == 1217) { + return (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_; + } + return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance(); + } + + public static final int WIND_FIELD_DUNGEON_SETTLE_INFO_FIELD_NUMBER = 1685; + /** + * 
+     * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+     * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+     * BPKPOIKNJKI role_combat_settle_info = 1461;
+     * FJHBJODAPMI char_master_settle_info = 1497;
+     * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+     * PBODMIJNHPG slime_cannon_settle_info = 1660;
+     *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; + * @return Whether the windFieldDungeonSettleInfo field is set. + */ + @java.lang.Override + public boolean hasWindFieldDungeonSettleInfo() { + return detailCase_ == 1685; + } + /** + * 
+     * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+     * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+     * BPKPOIKNJKI role_combat_settle_info = 1461;
+     * FJHBJODAPMI char_master_settle_info = 1497;
+     * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+     * PBODMIJNHPG slime_cannon_settle_info = 1660;
+     *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; + * @return The windFieldDungeonSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo getWindFieldDungeonSettleInfo() { + if (detailCase_ == 1685) { + return (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance(); + } + /** + * 
+     * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+     * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+     * BPKPOIKNJKI role_combat_settle_info = 1461;
+     * FJHBJODAPMI char_master_settle_info = 1497;
+     * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+     * PBODMIJNHPG slime_cannon_settle_info = 1660;
+     *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; + */ + @java.lang.Override + public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder getWindFieldDungeonSettleInfoOrBuilder() { + if (detailCase_ == 1685) { + return (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance(); + } + + public static final int TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY_FIELD_NUMBER = 1922; + /** + * .TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922; + * @return Whether the trialAvatarFirstPassDungeonNotify field is set. + */ + @java.lang.Override + public boolean hasTrialAvatarFirstPassDungeonNotify() { + return detailCase_ == 1922; + } + /** + * .TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922; + * @return The trialAvatarFirstPassDungeonNotify. + */ + @java.lang.Override + public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify getTrialAvatarFirstPassDungeonNotify() { + if (detailCase_ == 1922) { + return (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_; + } + return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance(); + } + /** + * .TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922; + */ + @java.lang.Override + public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotifyOrBuilder getTrialAvatarFirstPassDungeonNotifyOrBuilder() { + if (detailCase_ == 1922) { + return (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_; + } + return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance(); + } + + public static final int PACMAN_SETTLE_INFO_FIELD_NUMBER = 1970; + /** + * 
+     * JBIMMJPOEBA gain_buff_settle_info = 2002;
+     *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + * @return Whether the pacmanSettleInfo field is set. + */ + @java.lang.Override + public boolean hasPacmanSettleInfo() { + return detailCase_ == 1970; + } + /** + * 
+     * JBIMMJPOEBA gain_buff_settle_info = 2002;
+     *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + * @return The pacmanSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo getPacmanSettleInfo() { + if (detailCase_ == 1970) { + return (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_; + } + return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance(); + } + /** + * 
+     * JBIMMJPOEBA gain_buff_settle_info = 2002;
+     *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + @java.lang.Override + public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder getPacmanSettleInfoOrBuilder() { + if (detailCase_ == 1970) { + return (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_; + } + return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance(); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + com.google.protobuf.GeneratedMessageV3 + .serializeIntegerMapTo( + output, + internalGetStrengthenPointDataMap(), + StrengthenPointDataMapDefaultEntryHolder.defaultEntry, + 1); + if (isSuccess_ != false) { + output.writeBool(4, isSuccess_); + } + if (getFailCondListList().size() > 0) { + output.writeUInt32NoTag(42); + output.writeUInt32NoTag(failCondListMemoizedSerializedSize); + } + for (int i = 0; i < failCondList_.size(); i++) { + output.writeUInt32NoTag(failCondList_.getInt(i)); } for (int i = 0; i < exhibitionInfoList_.size(); i++) { output.writeMessage(6, exhibitionInfoList_.get(i)); @@ -863,12 +1955,51 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (result_ != 0) { output.writeUInt32(14, result_); } + if (detailCase_ == 162) { + output.writeMessage(162, (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_); + } + if (detailCase_ == 164) { + output.writeMessage(164, (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_); + } + if (detailCase_ == 243) { + output.writeMessage(243, (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_); + } + if (detailCase_ == 275) { + output.writeMessage(275, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_); + } + if (detailCase_ == 617) { + output.writeMessage(617, (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_); + } if (detailCase_ == 682) { output.writeMessage(682, (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_); } + if (detailCase_ == 711) { + output.writeMessage(711, (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_); + } + if (detailCase_ == 738) { + output.writeMessage(738, (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_); + } + if (detailCase_ == 1004) { + output.writeMessage(1004, (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_); + } + if (detailCase_ == 1186) { + output.writeMessage(1186, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); + } + if (detailCase_ == 1201) { + output.writeMessage(1201, (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_); + } + if (detailCase_ == 1217) { + output.writeMessage(1217, (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_); + } + if (detailCase_ == 1685) { + output.writeMessage(1685, (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_); + } if (detailCase_ == 1922) { output.writeMessage(1922, (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_); } + if (detailCase_ == 1970) { + output.writeMessage(1970, (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_); + } unknownFields.writeTo(output); } @@ -940,18 +2071,70 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(14, result_); } - if (detailCase_ == 682) { + if (detailCase_ == 162) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(682, (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_); + .computeMessageSize(162, (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_); } - if (detailCase_ == 1922) { + if (detailCase_ == 164) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1922, (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_); + .computeMessageSize(164, (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_); } - size += unknownFields.getSerializedSize(); - memoizedSize = size; - return size; - } + if (detailCase_ == 243) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(243, (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_); + } + if (detailCase_ == 275) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(275, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_); + } + if (detailCase_ == 617) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(617, (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_); + } + if (detailCase_ == 682) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(682, (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_); + } + if (detailCase_ == 711) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(711, (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_); + } + if (detailCase_ == 738) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(738, (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_); + } + if (detailCase_ == 1004) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1004, (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_); + } + if (detailCase_ == 1186) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1186, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_); + } + if (detailCase_ == 1201) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1201, (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_); + } + if (detailCase_ == 1217) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1217, (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_); + } + if (detailCase_ == 1685) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1685, (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_); + } + if (detailCase_ == 1922) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1922, (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_); + } + if (detailCase_ == 1970) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1970, (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } @java.lang.Override public boolean equals(final java.lang.Object obj) { @@ -985,14 +2168,66 @@ public boolean equals(final java.lang.Object obj) { != other.getResult()) return false; if (!getDetailCase().equals(other.getDetailCase())) return false; switch (detailCase_) { + case 162: + if (!getSummerTimeV2DungeonSettleInfo() + .equals(other.getSummerTimeV2DungeonSettleInfo())) return false; + break; + case 164: + if (!getBladeDanceSettleInfo() + .equals(other.getBladeDanceSettleInfo())) return false; + break; + case 243: + if (!getEffigyChallengeV2SettleInfo() + .equals(other.getEffigyChallengeV2SettleInfo())) return false; + break; + case 275: + if (!getChannellerSlabLoopDungeonResultInfo() + .equals(other.getChannellerSlabLoopDungeonResultInfo())) return false; + break; + case 617: + if (!getRoguelikeDungeonSettleInfo() + .equals(other.getRoguelikeDungeonSettleInfo())) return false; + break; case 682: if (!getTowerLevelEndNotify() .equals(other.getTowerLevelEndNotify())) return false; break; + case 711: + if (!getCrystalLinkSettleInfo() + .equals(other.getCrystalLinkSettleInfo())) return false; + break; + case 738: + if (!getInstableSpraySettleInfo() + .equals(other.getInstableSpraySettleInfo())) return false; + break; + case 1004: + if (!getFungusFighterV2SettleInfo() + .equals(other.getFungusFighterV2SettleInfo())) return false; + break; + case 1186: + if (!getEffigyChallengeDungeonResultInfo() + .equals(other.getEffigyChallengeDungeonResultInfo())) return false; + break; + case 1201: + if (!getMultiCharacterDungeonSettleInfo() + .equals(other.getMultiCharacterDungeonSettleInfo())) return false; + break; + case 1217: + if (!getTeamChainSettleInfo() + .equals(other.getTeamChainSettleInfo())) return false; + break; + case 1685: + if (!getWindFieldDungeonSettleInfo() + .equals(other.getWindFieldDungeonSettleInfo())) return false; + break; case 1922: if (!getTrialAvatarFirstPassDungeonNotify() .equals(other.getTrialAvatarFirstPassDungeonNotify())) return false; break; + case 1970: + if (!getPacmanSettleInfo() + .equals(other.getPacmanSettleInfo())) return false; + break; case 0: default: } @@ -1037,14 +2272,66 @@ public int hashCode() { hash = (37 * hash) + RESULT_FIELD_NUMBER; hash = (53 * hash) + getResult(); switch (detailCase_) { + case 162: + hash = (37 * hash) + SUMMER_TIME_V_2_DUNGEON_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getSummerTimeV2DungeonSettleInfo().hashCode(); + break; + case 164: + hash = (37 * hash) + BLADE_DANCE_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getBladeDanceSettleInfo().hashCode(); + break; + case 243: + hash = (37 * hash) + EFFIGY_CHALLENGE_V_2_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getEffigyChallengeV2SettleInfo().hashCode(); + break; + case 275: + hash = (37 * hash) + CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER; + hash = (53 * hash) + getChannellerSlabLoopDungeonResultInfo().hashCode(); + break; + case 617: + hash = (37 * hash) + ROGUELIKE_DUNGEON_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getRoguelikeDungeonSettleInfo().hashCode(); + break; case 682: hash = (37 * hash) + TOWER_LEVEL_END_NOTIFY_FIELD_NUMBER; hash = (53 * hash) + getTowerLevelEndNotify().hashCode(); break; + case 711: + hash = (37 * hash) + CRYSTAL_LINK_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getCrystalLinkSettleInfo().hashCode(); + break; + case 738: + hash = (37 * hash) + INSTABLE_SPRAY_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getInstableSpraySettleInfo().hashCode(); + break; + case 1004: + hash = (37 * hash) + FUNGUS_FIGHTER_V_2_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getFungusFighterV2SettleInfo().hashCode(); + break; + case 1186: + hash = (37 * hash) + EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER; + hash = (53 * hash) + getEffigyChallengeDungeonResultInfo().hashCode(); + break; + case 1201: + hash = (37 * hash) + MULTI_CHARACTER_DUNGEON_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getMultiCharacterDungeonSettleInfo().hashCode(); + break; + case 1217: + hash = (37 * hash) + TEAM_CHAIN_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getTeamChainSettleInfo().hashCode(); + break; + case 1685: + hash = (37 * hash) + WIND_FIELD_DUNGEON_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getWindFieldDungeonSettleInfo().hashCode(); + break; case 1922: hash = (37 * hash) + TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY_FIELD_NUMBER; hash = (53 * hash) + getTrialAvatarFirstPassDungeonNotify().hashCode(); break; + case 1970: + hash = (37 * hash) + PACMAN_SETTLE_INFO_FIELD_NUMBER; + hash = (53 * hash) + getPacmanSettleInfo().hashCode(); + break; case 0: default: } @@ -1144,6 +2431,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 8007
+     *
+ * * Protobuf type {@code DungeonSettleNotify} */ public static final class Builder extends @@ -1283,6 +2574,41 @@ public emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNoti result.settleShow_.makeImmutable(); result.createPlayerUid_ = createPlayerUid_; result.result_ = result_; + if (detailCase_ == 162) { + if (summerTimeV2DungeonSettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = summerTimeV2DungeonSettleInfoBuilder_.build(); + } + } + if (detailCase_ == 164) { + if (bladeDanceSettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = bladeDanceSettleInfoBuilder_.build(); + } + } + if (detailCase_ == 243) { + if (effigyChallengeV2SettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = effigyChallengeV2SettleInfoBuilder_.build(); + } + } + if (detailCase_ == 275) { + if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = channellerSlabLoopDungeonResultInfoBuilder_.build(); + } + } + if (detailCase_ == 617) { + if (roguelikeDungeonSettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = roguelikeDungeonSettleInfoBuilder_.build(); + } + } if (detailCase_ == 682) { if (towerLevelEndNotifyBuilder_ == null) { result.detail_ = detail_; @@ -1290,6 +2616,55 @@ public emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNoti result.detail_ = towerLevelEndNotifyBuilder_.build(); } } + if (detailCase_ == 711) { + if (crystalLinkSettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = crystalLinkSettleInfoBuilder_.build(); + } + } + if (detailCase_ == 738) { + if (instableSpraySettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = instableSpraySettleInfoBuilder_.build(); + } + } + if (detailCase_ == 1004) { + if (fungusFighterV2SettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = fungusFighterV2SettleInfoBuilder_.build(); + } + } + if (detailCase_ == 1186) { + if (effigyChallengeDungeonResultInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = effigyChallengeDungeonResultInfoBuilder_.build(); + } + } + if (detailCase_ == 1201) { + if (multiCharacterDungeonSettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = multiCharacterDungeonSettleInfoBuilder_.build(); + } + } + if (detailCase_ == 1217) { + if (teamChainSettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = teamChainSettleInfoBuilder_.build(); + } + } + if (detailCase_ == 1685) { + if (windFieldDungeonSettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = windFieldDungeonSettleInfoBuilder_.build(); + } + } if (detailCase_ == 1922) { if (trialAvatarFirstPassDungeonNotifyBuilder_ == null) { result.detail_ = detail_; @@ -1297,6 +2672,13 @@ public emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNoti result.detail_ = trialAvatarFirstPassDungeonNotifyBuilder_.build(); } } + if (detailCase_ == 1970) { + if (pacmanSettleInfoBuilder_ == null) { + result.detail_ = detail_; + } else { + result.detail_ = pacmanSettleInfoBuilder_.build(); + } + } result.detailCase_ = detailCase_; onBuilt(); return result; @@ -1405,14 +2787,66 @@ public Builder mergeFrom(emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass setResult(other.getResult()); } switch (other.getDetailCase()) { + case SUMMER_TIME_V_2_DUNGEON_SETTLE_INFO: { + mergeSummerTimeV2DungeonSettleInfo(other.getSummerTimeV2DungeonSettleInfo()); + break; + } + case BLADE_DANCE_SETTLE_INFO: { + mergeBladeDanceSettleInfo(other.getBladeDanceSettleInfo()); + break; + } + case EFFIGY_CHALLENGE_V_2_SETTLE_INFO: { + mergeEffigyChallengeV2SettleInfo(other.getEffigyChallengeV2SettleInfo()); + break; + } + case CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO: { + mergeChannellerSlabLoopDungeonResultInfo(other.getChannellerSlabLoopDungeonResultInfo()); + break; + } + case ROGUELIKE_DUNGEON_SETTLE_INFO: { + mergeRoguelikeDungeonSettleInfo(other.getRoguelikeDungeonSettleInfo()); + break; + } case TOWER_LEVEL_END_NOTIFY: { mergeTowerLevelEndNotify(other.getTowerLevelEndNotify()); break; } + case CRYSTAL_LINK_SETTLE_INFO: { + mergeCrystalLinkSettleInfo(other.getCrystalLinkSettleInfo()); + break; + } + case INSTABLE_SPRAY_SETTLE_INFO: { + mergeInstableSpraySettleInfo(other.getInstableSpraySettleInfo()); + break; + } + case FUNGUS_FIGHTER_V_2_SETTLE_INFO: { + mergeFungusFighterV2SettleInfo(other.getFungusFighterV2SettleInfo()); + break; + } + case EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO: { + mergeEffigyChallengeDungeonResultInfo(other.getEffigyChallengeDungeonResultInfo()); + break; + } + case MULTI_CHARACTER_DUNGEON_SETTLE_INFO: { + mergeMultiCharacterDungeonSettleInfo(other.getMultiCharacterDungeonSettleInfo()); + break; + } + case TEAM_CHAIN_SETTLE_INFO: { + mergeTeamChainSettleInfo(other.getTeamChainSettleInfo()); + break; + } + case WIND_FIELD_DUNGEON_SETTLE_INFO: { + mergeWindFieldDungeonSettleInfo(other.getWindFieldDungeonSettleInfo()); + break; + } case TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY: { mergeTrialAvatarFirstPassDungeonNotify(other.getTrialAvatarFirstPassDungeonNotify()); break; } + case PACMAN_SETTLE_INFO: { + mergePacmanSettleInfo(other.getPacmanSettleInfo()); + break; + } case DETAIL_NOT_SET: { break; } @@ -2131,237 +3565,2316 @@ public Builder removeSettleShow( return this; } /** - * Use alternate mutation accessors instead. + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableSettleShow() { + return internalGetMutableSettleShow().getMutableMap(); + } + /** + * map<uint32, .ParamList> settle_show = 11; + */ + public Builder putSettleShow( + int key, + emu.grasscutter.net.proto.ParamListOuterClass.ParamList value) { + + if (value == null) { throw new java.lang.NullPointerException(); } + internalGetMutableSettleShow().getMutableMap() + .put(key, value); + return this; + } + /** + * map<uint32, .ParamList> settle_show = 11; + */ + + public Builder putAllSettleShow( + java.util.Map values) { + internalGetMutableSettleShow().getMutableMap() + .putAll(values); + return this; + } + + private int createPlayerUid_ ; + /** + * uint32 create_player_uid = 12; + * @return The createPlayerUid. + */ + @java.lang.Override + public int getCreatePlayerUid() { + return createPlayerUid_; + } + /** + * uint32 create_player_uid = 12; + * @param value The createPlayerUid to set. + * @return This builder for chaining. + */ + public Builder setCreatePlayerUid(int value) { + + createPlayerUid_ = value; + onChanged(); + return this; + } + /** + * uint32 create_player_uid = 12; + * @return This builder for chaining. + */ + public Builder clearCreatePlayerUid() { + + createPlayerUid_ = 0; + onChanged(); + return this; + } + + private int result_ ; + /** + * uint32 result = 14; + * @return The result. + */ + @java.lang.Override + public int getResult() { + return result_; + } + /** + * uint32 result = 14; + * @param value The result to set. + * @return This builder for chaining. + */ + public Builder setResult(int value) { + + result_ = value; + onChanged(); + return this; + } + /** + * uint32 result = 14; + * @return This builder for chaining. + */ + public Builder clearResult() { + + result_ = 0; + onChanged(); + return this; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder> summerTimeV2DungeonSettleInfoBuilder_; + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + * @return Whether the summerTimeV2DungeonSettleInfo field is set. + */ + @java.lang.Override + public boolean hasSummerTimeV2DungeonSettleInfo() { + return detailCase_ == 162; + } + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + * @return The summerTimeV2DungeonSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo getSummerTimeV2DungeonSettleInfo() { + if (summerTimeV2DungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 162) { + return (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 162) { + return summerTimeV2DungeonSettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + */ + public Builder setSummerTimeV2DungeonSettleInfo(emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo value) { + if (summerTimeV2DungeonSettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + summerTimeV2DungeonSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 162; + return this; + } + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + */ + public Builder setSummerTimeV2DungeonSettleInfo( + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder builderForValue) { + if (summerTimeV2DungeonSettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + summerTimeV2DungeonSettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 162; + return this; + } + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + */ + public Builder mergeSummerTimeV2DungeonSettleInfo(emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo value) { + if (summerTimeV2DungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 162 && + detail_ != emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 162) { + summerTimeV2DungeonSettleInfoBuilder_.mergeFrom(value); + } + summerTimeV2DungeonSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 162; + return this; + } + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + */ + public Builder clearSummerTimeV2DungeonSettleInfo() { + if (summerTimeV2DungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 162) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 162) { + detailCase_ = 0; + detail_ = null; + } + summerTimeV2DungeonSettleInfoBuilder_.clear(); + } + return this; + } + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + */ + public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder getSummerTimeV2DungeonSettleInfoBuilder() { + return getSummerTimeV2DungeonSettleInfoFieldBuilder().getBuilder(); + } + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + */ + @java.lang.Override + public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder getSummerTimeV2DungeonSettleInfoOrBuilder() { + if ((detailCase_ == 162) && (summerTimeV2DungeonSettleInfoBuilder_ != null)) { + return summerTimeV2DungeonSettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 162) { + return (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * BLNEKLPBJJD effigy_challenge_v_5_settle_info = 157;
+       *
+ * + * .SummerTimeV2DungeonSettleInfo summer_time_v_2_dungeon_settle_info = 162; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder> + getSummerTimeV2DungeonSettleInfoFieldBuilder() { + if (summerTimeV2DungeonSettleInfoBuilder_ == null) { + if (!(detailCase_ == 162)) { + detail_ = emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance(); + } + summerTimeV2DungeonSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 162; + onChanged();; + return summerTimeV2DungeonSettleInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder> bladeDanceSettleInfoBuilder_; + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + * @return Whether the bladeDanceSettleInfo field is set. + */ + @java.lang.Override + public boolean hasBladeDanceSettleInfo() { + return detailCase_ == 164; + } + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + * @return The bladeDanceSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo getBladeDanceSettleInfo() { + if (bladeDanceSettleInfoBuilder_ == null) { + if (detailCase_ == 164) { + return (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_; + } + return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 164) { + return bladeDanceSettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance(); + } + } + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + */ + public Builder setBladeDanceSettleInfo(emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo value) { + if (bladeDanceSettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + bladeDanceSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 164; + return this; + } + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + */ + public Builder setBladeDanceSettleInfo( + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder builderForValue) { + if (bladeDanceSettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + bladeDanceSettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 164; + return this; + } + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + */ + public Builder mergeBladeDanceSettleInfo(emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo value) { + if (bladeDanceSettleInfoBuilder_ == null) { + if (detailCase_ == 164 && + detail_ != emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.newBuilder((emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 164) { + bladeDanceSettleInfoBuilder_.mergeFrom(value); + } + bladeDanceSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 164; + return this; + } + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + */ + public Builder clearBladeDanceSettleInfo() { + if (bladeDanceSettleInfoBuilder_ == null) { + if (detailCase_ == 164) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 164) { + detailCase_ = 0; + detail_ = null; + } + bladeDanceSettleInfoBuilder_.clear(); + } + return this; + } + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + */ + public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder getBladeDanceSettleInfoBuilder() { + return getBladeDanceSettleInfoFieldBuilder().getBuilder(); + } + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + */ + @java.lang.Override + public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder getBladeDanceSettleInfoOrBuilder() { + if ((detailCase_ == 164) && (bladeDanceSettleInfoBuilder_ != null)) { + return bladeDanceSettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 164) { + return (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_; + } + return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance(); + } + } + /** + * .BladeDanceSettleInfo blade_dance_settle_info = 164; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder> + getBladeDanceSettleInfoFieldBuilder() { + if (bladeDanceSettleInfoBuilder_ == null) { + if (!(detailCase_ == 164)) { + detail_ = emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance(); + } + bladeDanceSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 164; + onChanged();; + return bladeDanceSettleInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder> effigyChallengeV2SettleInfoBuilder_; + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + * @return Whether the effigyChallengeV2SettleInfo field is set. + */ + @java.lang.Override + public boolean hasEffigyChallengeV2SettleInfo() { + return detailCase_ == 243; + } + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + * @return The effigyChallengeV2SettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo getEffigyChallengeV2SettleInfo() { + if (effigyChallengeV2SettleInfoBuilder_ == null) { + if (detailCase_ == 243) { + return (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_; + } + return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 243) { + return effigyChallengeV2SettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + public Builder setEffigyChallengeV2SettleInfo(emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo value) { + if (effigyChallengeV2SettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + effigyChallengeV2SettleInfoBuilder_.setMessage(value); + } + detailCase_ = 243; + return this; + } + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + public Builder setEffigyChallengeV2SettleInfo( + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder builderForValue) { + if (effigyChallengeV2SettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + effigyChallengeV2SettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 243; + return this; + } + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + public Builder mergeEffigyChallengeV2SettleInfo(emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo value) { + if (effigyChallengeV2SettleInfoBuilder_ == null) { + if (detailCase_ == 243 && + detail_ != emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.newBuilder((emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 243) { + effigyChallengeV2SettleInfoBuilder_.mergeFrom(value); + } + effigyChallengeV2SettleInfoBuilder_.setMessage(value); + } + detailCase_ = 243; + return this; + } + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + public Builder clearEffigyChallengeV2SettleInfo() { + if (effigyChallengeV2SettleInfoBuilder_ == null) { + if (detailCase_ == 243) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 243) { + detailCase_ = 0; + detail_ = null; + } + effigyChallengeV2SettleInfoBuilder_.clear(); + } + return this; + } + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder getEffigyChallengeV2SettleInfoBuilder() { + return getEffigyChallengeV2SettleInfoFieldBuilder().getBuilder(); + } + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder getEffigyChallengeV2SettleInfoOrBuilder() { + if ((detailCase_ == 243) && (effigyChallengeV2SettleInfoBuilder_ != null)) { + return effigyChallengeV2SettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 243) { + return (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_; + } + return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * NJHEGCCDBBC recharge_disk_settle_info = 175;
+       * PDHBOHJEDBJ stamina_fight_settle_info = 178;
+       * FCCEFPNFMBH mist_trial_settle_info = 199;
+       * NGAMJOKKJPB filmfest_sniper_settle_info = 235;
+       *
+ * + * .EffigyChallengeV2SettleInfo effigy_challenge_v_2_settle_info = 243; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder> + getEffigyChallengeV2SettleInfoFieldBuilder() { + if (effigyChallengeV2SettleInfoBuilder_ == null) { + if (!(detailCase_ == 243)) { + detail_ = emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance(); + } + effigyChallengeV2SettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder>( + (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 243; + onChanged();; + return effigyChallengeV2SettleInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder> channellerSlabLoopDungeonResultInfoBuilder_; + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + * @return Whether the channellerSlabLoopDungeonResultInfo field is set. + */ + @java.lang.Override + public boolean hasChannellerSlabLoopDungeonResultInfo() { + return detailCase_ == 275; + } + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + * @return The channellerSlabLoopDungeonResultInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() { + if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { + if (detailCase_ == 275) { + return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + } else { + if (detailCase_ == 275) { + return channellerSlabLoopDungeonResultInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + } + } + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + public Builder setChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo value) { + if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + channellerSlabLoopDungeonResultInfoBuilder_.setMessage(value); + } + detailCase_ = 275; + return this; + } + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + public Builder setChannellerSlabLoopDungeonResultInfo( + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder builderForValue) { + if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + channellerSlabLoopDungeonResultInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 275; + return this; + } + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + public Builder mergeChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo value) { + if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { + if (detailCase_ == 275 && + detail_ != emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 275) { + channellerSlabLoopDungeonResultInfoBuilder_.mergeFrom(value); + } + channellerSlabLoopDungeonResultInfoBuilder_.setMessage(value); + } + detailCase_ = 275; + return this; + } + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + public Builder clearChannellerSlabLoopDungeonResultInfo() { + if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { + if (detailCase_ == 275) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 275) { + detailCase_ = 0; + detail_ = null; + } + channellerSlabLoopDungeonResultInfoBuilder_.clear(); + } + return this; + } + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder getChannellerSlabLoopDungeonResultInfoBuilder() { + return getChannellerSlabLoopDungeonResultInfoFieldBuilder().getBuilder(); + } + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() { + if ((detailCase_ == 275) && (channellerSlabLoopDungeonResultInfoBuilder_ != null)) { + return channellerSlabLoopDungeonResultInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 275) { + return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + } + } + /** + * 
+       * PAOPHEDMOFK fairy_tales_combat_settle_info = 254;
+       *
+ * + * .ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 275; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder> + getChannellerSlabLoopDungeonResultInfoFieldBuilder() { + if (channellerSlabLoopDungeonResultInfoBuilder_ == null) { + if (!(detailCase_ == 275)) { + detail_ = emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance(); + } + channellerSlabLoopDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder>( + (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 275; + onChanged();; + return channellerSlabLoopDungeonResultInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder> roguelikeDungeonSettleInfoBuilder_; + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + * @return Whether the roguelikeDungeonSettleInfo field is set. + */ + @java.lang.Override + public boolean hasRoguelikeDungeonSettleInfo() { + return detailCase_ == 617; + } + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + * @return The roguelikeDungeonSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo getRoguelikeDungeonSettleInfo() { + if (roguelikeDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 617) { + return (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 617) { + return roguelikeDungeonSettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + public Builder setRoguelikeDungeonSettleInfo(emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo value) { + if (roguelikeDungeonSettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + roguelikeDungeonSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 617; + return this; + } + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + public Builder setRoguelikeDungeonSettleInfo( + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder builderForValue) { + if (roguelikeDungeonSettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + roguelikeDungeonSettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 617; + return this; + } + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + public Builder mergeRoguelikeDungeonSettleInfo(emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo value) { + if (roguelikeDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 617 && + detail_ != emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 617) { + roguelikeDungeonSettleInfoBuilder_.mergeFrom(value); + } + roguelikeDungeonSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 617; + return this; + } + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + public Builder clearRoguelikeDungeonSettleInfo() { + if (roguelikeDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 617) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 617) { + detailCase_ = 0; + detail_ = null; + } + roguelikeDungeonSettleInfoBuilder_.clear(); + } + return this; + } + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder getRoguelikeDungeonSettleInfoBuilder() { + return getRoguelikeDungeonSettleInfoFieldBuilder().getBuilder(); + } + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + @java.lang.Override + public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder getRoguelikeDungeonSettleInfoOrBuilder() { + if ((detailCase_ == 617) && (roguelikeDungeonSettleInfoBuilder_ != null)) { + return roguelikeDungeonSettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 617) { + return (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * NCLAMPEGPKJ inspiration_spurt_dungeon_settle_info = 609;
+       *
+ * + * .RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 617; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder> + getRoguelikeDungeonSettleInfoFieldBuilder() { + if (roguelikeDungeonSettleInfoBuilder_ == null) { + if (!(detailCase_ == 617)) { + detail_ = emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance(); + } + roguelikeDungeonSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 617; + onChanged();; + return roguelikeDungeonSettleInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder> towerLevelEndNotifyBuilder_; + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + * @return Whether the towerLevelEndNotify field is set. + */ + @java.lang.Override + public boolean hasTowerLevelEndNotify() { + return detailCase_ == 682; + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + * @return The towerLevelEndNotify. + */ + @java.lang.Override + public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify getTowerLevelEndNotify() { + if (towerLevelEndNotifyBuilder_ == null) { + if (detailCase_ == 682) { + return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_; + } + return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + } else { + if (detailCase_ == 682) { + return towerLevelEndNotifyBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + } + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + */ + public Builder setTowerLevelEndNotify(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify value) { + if (towerLevelEndNotifyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + towerLevelEndNotifyBuilder_.setMessage(value); + } + detailCase_ = 682; + return this; + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + */ + public Builder setTowerLevelEndNotify( + emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder builderForValue) { + if (towerLevelEndNotifyBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + towerLevelEndNotifyBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 682; + return this; + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + */ + public Builder mergeTowerLevelEndNotify(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify value) { + if (towerLevelEndNotifyBuilder_ == null) { + if (detailCase_ == 682 && + detail_ != emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.newBuilder((emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 682) { + towerLevelEndNotifyBuilder_.mergeFrom(value); + } + towerLevelEndNotifyBuilder_.setMessage(value); + } + detailCase_ = 682; + return this; + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + */ + public Builder clearTowerLevelEndNotify() { + if (towerLevelEndNotifyBuilder_ == null) { + if (detailCase_ == 682) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 682) { + detailCase_ = 0; + detail_ = null; + } + towerLevelEndNotifyBuilder_.clear(); + } + return this; + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + */ + public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder getTowerLevelEndNotifyBuilder() { + return getTowerLevelEndNotifyFieldBuilder().getBuilder(); + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + */ + @java.lang.Override + public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder getTowerLevelEndNotifyOrBuilder() { + if ((detailCase_ == 682) && (towerLevelEndNotifyBuilder_ != null)) { + return towerLevelEndNotifyBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 682) { + return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_; + } + return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + } + } + /** + * .TowerLevelEndNotify tower_level_end_notify = 682; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder> + getTowerLevelEndNotifyFieldBuilder() { + if (towerLevelEndNotifyBuilder_ == null) { + if (!(detailCase_ == 682)) { + detail_ = emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + } + towerLevelEndNotifyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder>( + (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 682; + onChanged();; + return towerLevelEndNotifyBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder> crystalLinkSettleInfoBuilder_; + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + * @return Whether the crystalLinkSettleInfo field is set. + */ + @java.lang.Override + public boolean hasCrystalLinkSettleInfo() { + return detailCase_ == 711; + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + * @return The crystalLinkSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo getCrystalLinkSettleInfo() { + if (crystalLinkSettleInfoBuilder_ == null) { + if (detailCase_ == 711) { + return (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 711) { + return crystalLinkSettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance(); + } + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + public Builder setCrystalLinkSettleInfo(emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo value) { + if (crystalLinkSettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + crystalLinkSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 711; + return this; + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + public Builder setCrystalLinkSettleInfo( + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder builderForValue) { + if (crystalLinkSettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + crystalLinkSettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 711; + return this; + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + public Builder mergeCrystalLinkSettleInfo(emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo value) { + if (crystalLinkSettleInfoBuilder_ == null) { + if (detailCase_ == 711 && + detail_ != emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 711) { + crystalLinkSettleInfoBuilder_.mergeFrom(value); + } + crystalLinkSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 711; + return this; + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + public Builder clearCrystalLinkSettleInfo() { + if (crystalLinkSettleInfoBuilder_ == null) { + if (detailCase_ == 711) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 711) { + detailCase_ = 0; + detail_ = null; + } + crystalLinkSettleInfoBuilder_.clear(); + } + return this; + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder getCrystalLinkSettleInfoBuilder() { + return getCrystalLinkSettleInfoFieldBuilder().getBuilder(); + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + @java.lang.Override + public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder getCrystalLinkSettleInfoOrBuilder() { + if ((detailCase_ == 711) && (crystalLinkSettleInfoBuilder_ != null)) { + return crystalLinkSettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 711) { + return (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance(); + } + } + /** + * .CrystalLinkDungeonSettleInfo crystal_link_settle_info = 711; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder> + getCrystalLinkSettleInfoFieldBuilder() { + if (crystalLinkSettleInfoBuilder_ == null) { + if (!(detailCase_ == 711)) { + detail_ = emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance(); + } + crystalLinkSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 711; + onChanged();; + return crystalLinkSettleInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder> instableSpraySettleInfoBuilder_; + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + * @return Whether the instableSpraySettleInfo field is set. + */ + @java.lang.Override + public boolean hasInstableSpraySettleInfo() { + return detailCase_ == 738; + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + * @return The instableSpraySettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo getInstableSpraySettleInfo() { + if (instableSpraySettleInfoBuilder_ == null) { + if (detailCase_ == 738) { + return (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 738) { + return instableSpraySettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance(); + } + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + public Builder setInstableSpraySettleInfo(emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo value) { + if (instableSpraySettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + instableSpraySettleInfoBuilder_.setMessage(value); + } + detailCase_ = 738; + return this; + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + public Builder setInstableSpraySettleInfo( + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder builderForValue) { + if (instableSpraySettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + instableSpraySettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 738; + return this; + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + public Builder mergeInstableSpraySettleInfo(emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo value) { + if (instableSpraySettleInfoBuilder_ == null) { + if (detailCase_ == 738 && + detail_ != emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 738) { + instableSpraySettleInfoBuilder_.mergeFrom(value); + } + instableSpraySettleInfoBuilder_.setMessage(value); + } + detailCase_ = 738; + return this; + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + public Builder clearInstableSpraySettleInfo() { + if (instableSpraySettleInfoBuilder_ == null) { + if (detailCase_ == 738) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 738) { + detailCase_ = 0; + detail_ = null; + } + instableSpraySettleInfoBuilder_.clear(); + } + return this; + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder getInstableSpraySettleInfoBuilder() { + return getInstableSpraySettleInfoFieldBuilder().getBuilder(); + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + @java.lang.Override + public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder getInstableSpraySettleInfoOrBuilder() { + if ((detailCase_ == 738) && (instableSpraySettleInfoBuilder_ != null)) { + return instableSpraySettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 738) { + return (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance(); + } + } + /** + * .InstableSprayDungeonSettleInfo instable_spray_settle_info = 738; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder> + getInstableSpraySettleInfoFieldBuilder() { + if (instableSpraySettleInfoBuilder_ == null) { + if (!(detailCase_ == 738)) { + detail_ = emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance(); + } + instableSpraySettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 738; + onChanged();; + return instableSpraySettleInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder> fungusFighterV2SettleInfoBuilder_; + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + * @return Whether the fungusFighterV2SettleInfo field is set. + */ + @java.lang.Override + public boolean hasFungusFighterV2SettleInfo() { + return detailCase_ == 1004; + } + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + * @return The fungusFighterV2SettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo getFungusFighterV2SettleInfo() { + if (fungusFighterV2SettleInfoBuilder_ == null) { + if (detailCase_ == 1004) { + return (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_; + } + return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 1004) { + return fungusFighterV2SettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + public Builder setFungusFighterV2SettleInfo(emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo value) { + if (fungusFighterV2SettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + fungusFighterV2SettleInfoBuilder_.setMessage(value); + } + detailCase_ = 1004; + return this; + } + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + public Builder setFungusFighterV2SettleInfo( + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder builderForValue) { + if (fungusFighterV2SettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + fungusFighterV2SettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 1004; + return this; + } + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + public Builder mergeFungusFighterV2SettleInfo(emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo value) { + if (fungusFighterV2SettleInfoBuilder_ == null) { + if (detailCase_ == 1004 && + detail_ != emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.newBuilder((emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 1004) { + fungusFighterV2SettleInfoBuilder_.mergeFrom(value); + } + fungusFighterV2SettleInfoBuilder_.setMessage(value); + } + detailCase_ = 1004; + return this; + } + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + public Builder clearFungusFighterV2SettleInfo() { + if (fungusFighterV2SettleInfoBuilder_ == null) { + if (detailCase_ == 1004) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 1004) { + detailCase_ = 0; + detail_ = null; + } + fungusFighterV2SettleInfoBuilder_.clear(); + } + return this; + } + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder getFungusFighterV2SettleInfoBuilder() { + return getFungusFighterV2SettleInfoFieldBuilder().getBuilder(); + } + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder getFungusFighterV2SettleInfoOrBuilder() { + if ((detailCase_ == 1004) && (fungusFighterV2SettleInfoBuilder_ != null)) { + return fungusFighterV2SettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 1004) { + return (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_; + } + return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * MCIEOBOGOMJ lost_samachurl_sneak_settle_info = 848;
+       * KEHHNNDNEOO bullet_hell_settle_info = 881;
+       *
+ * + * .FungusFighterV2SettleInfo fungus_fighter_v_2_settle_info = 1004; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder> + getFungusFighterV2SettleInfoFieldBuilder() { + if (fungusFighterV2SettleInfoBuilder_ == null) { + if (!(detailCase_ == 1004)) { + detail_ = emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance(); + } + fungusFighterV2SettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder>( + (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 1004; + onChanged();; + return fungusFighterV2SettleInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> effigyChallengeDungeonResultInfoBuilder_; + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + * @return Whether the effigyChallengeDungeonResultInfo field is set. + */ + @java.lang.Override + public boolean hasEffigyChallengeDungeonResultInfo() { + return detailCase_ == 1186; + } + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + * @return The effigyChallengeDungeonResultInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() { + if (effigyChallengeDungeonResultInfoBuilder_ == null) { + if (detailCase_ == 1186) { + return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + } else { + if (detailCase_ == 1186) { + return effigyChallengeDungeonResultInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + } + } + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + public Builder setEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) { + if (effigyChallengeDungeonResultInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + effigyChallengeDungeonResultInfoBuilder_.setMessage(value); + } + detailCase_ = 1186; + return this; + } + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + public Builder setEffigyChallengeDungeonResultInfo( + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder builderForValue) { + if (effigyChallengeDungeonResultInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + effigyChallengeDungeonResultInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 1186; + return this; + } + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + public Builder mergeEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) { + if (effigyChallengeDungeonResultInfoBuilder_ == null) { + if (detailCase_ == 1186 && + detail_ != emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 1186) { + effigyChallengeDungeonResultInfoBuilder_.mergeFrom(value); + } + effigyChallengeDungeonResultInfoBuilder_.setMessage(value); + } + detailCase_ = 1186; + return this; + } + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + public Builder clearEffigyChallengeDungeonResultInfo() { + if (effigyChallengeDungeonResultInfoBuilder_ == null) { + if (detailCase_ == 1186) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 1186) { + detailCase_ = 0; + detail_ = null; + } + effigyChallengeDungeonResultInfoBuilder_.clear(); + } + return this; + } + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder getEffigyChallengeDungeonResultInfoBuilder() { + return getEffigyChallengeDungeonResultInfoFieldBuilder().getBuilder(); + } + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + @java.lang.Override + public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() { + if ((detailCase_ == 1186) && (effigyChallengeDungeonResultInfoBuilder_ != null)) { + return effigyChallengeDungeonResultInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 1186) { + return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_; + } + return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + } + } + /** + * 
+       * BGCJFMNOONB goal_challenge_settle_info = 1051;
+       * PAFDOOMKDOC fungus_fighter_v_3_settle_info = 1059;
+       * AMGOHIOICDJ auto_time_stop_settle_info = 1110;
+       *
+ * + * .EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1186; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> + getEffigyChallengeDungeonResultInfoFieldBuilder() { + if (effigyChallengeDungeonResultInfoBuilder_ == null) { + if (!(detailCase_ == 1186)) { + detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance(); + } + effigyChallengeDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder>( + (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 1186; + onChanged();; + return effigyChallengeDungeonResultInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder> multiCharacterDungeonSettleInfoBuilder_; + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + * @return Whether the multiCharacterDungeonSettleInfo field is set. + */ + @java.lang.Override + public boolean hasMultiCharacterDungeonSettleInfo() { + return detailCase_ == 1201; + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + * @return The multiCharacterDungeonSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo getMultiCharacterDungeonSettleInfo() { + if (multiCharacterDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 1201) { + return (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 1201) { + return multiCharacterDungeonSettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance(); + } + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + public Builder setMultiCharacterDungeonSettleInfo(emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo value) { + if (multiCharacterDungeonSettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + multiCharacterDungeonSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 1201; + return this; + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + public Builder setMultiCharacterDungeonSettleInfo( + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder builderForValue) { + if (multiCharacterDungeonSettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + multiCharacterDungeonSettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 1201; + return this; + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + public Builder mergeMultiCharacterDungeonSettleInfo(emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo value) { + if (multiCharacterDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 1201 && + detail_ != emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 1201) { + multiCharacterDungeonSettleInfoBuilder_.mergeFrom(value); + } + multiCharacterDungeonSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 1201; + return this; + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + public Builder clearMultiCharacterDungeonSettleInfo() { + if (multiCharacterDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 1201) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 1201) { + detailCase_ = 0; + detail_ = null; + } + multiCharacterDungeonSettleInfoBuilder_.clear(); + } + return this; + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder getMultiCharacterDungeonSettleInfoBuilder() { + return getMultiCharacterDungeonSettleInfoFieldBuilder().getBuilder(); + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + @java.lang.Override + public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder getMultiCharacterDungeonSettleInfoOrBuilder() { + if ((detailCase_ == 1201) && (multiCharacterDungeonSettleInfoBuilder_ != null)) { + return multiCharacterDungeonSettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 1201) { + return (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_; + } + return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance(); + } + } + /** + * .MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1201; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder> + getMultiCharacterDungeonSettleInfoFieldBuilder() { + if (multiCharacterDungeonSettleInfoBuilder_ == null) { + if (!(detailCase_ == 1201)) { + detail_ = emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance(); + } + multiCharacterDungeonSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 1201; + onChanged();; + return multiCharacterDungeonSettleInfoBuilder_; + } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder> teamChainSettleInfoBuilder_; + /** + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; + * @return Whether the teamChainSettleInfo field is set. */ - @java.lang.Deprecated - public java.util.Map - getMutableSettleShow() { - return internalGetMutableSettleShow().getMutableMap(); + @java.lang.Override + public boolean hasTeamChainSettleInfo() { + return detailCase_ == 1217; } /** - * map<uint32, .ParamList> settle_show = 11; + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; + * @return The teamChainSettleInfo. */ - public Builder putSettleShow( - int key, - emu.grasscutter.net.proto.ParamListOuterClass.ParamList value) { - - if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableSettleShow().getMutableMap() - .put(key, value); - return this; + @java.lang.Override + public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo getTeamChainSettleInfo() { + if (teamChainSettleInfoBuilder_ == null) { + if (detailCase_ == 1217) { + return (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_; + } + return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 1217) { + return teamChainSettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance(); + } } /** - * map<uint32, .ParamList> settle_show = 11; + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; */ - - public Builder putAllSettleShow( - java.util.Map values) { - internalGetMutableSettleShow().getMutableMap() - .putAll(values); + public Builder setTeamChainSettleInfo(emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo value) { + if (teamChainSettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + teamChainSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 1217; return this; } - - private int createPlayerUid_ ; /** - * uint32 create_player_uid = 12; - * @return The createPlayerUid. + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; */ - @java.lang.Override - public int getCreatePlayerUid() { - return createPlayerUid_; + public Builder setTeamChainSettleInfo( + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder builderForValue) { + if (teamChainSettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + teamChainSettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 1217; + return this; } /** - * uint32 create_player_uid = 12; - * @param value The createPlayerUid to set. - * @return This builder for chaining. + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; */ - public Builder setCreatePlayerUid(int value) { - - createPlayerUid_ = value; - onChanged(); + public Builder mergeTeamChainSettleInfo(emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo value) { + if (teamChainSettleInfoBuilder_ == null) { + if (detailCase_ == 1217 && + detail_ != emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.newBuilder((emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 1217) { + teamChainSettleInfoBuilder_.mergeFrom(value); + } + teamChainSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 1217; return this; } /** - * uint32 create_player_uid = 12; - * @return This builder for chaining. + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; */ - public Builder clearCreatePlayerUid() { - - createPlayerUid_ = 0; - onChanged(); + public Builder clearTeamChainSettleInfo() { + if (teamChainSettleInfoBuilder_ == null) { + if (detailCase_ == 1217) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 1217) { + detailCase_ = 0; + detail_ = null; + } + teamChainSettleInfoBuilder_.clear(); + } return this; } - - private int result_ ; /** - * uint32 result = 14; - * @return The result. + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; */ - @java.lang.Override - public int getResult() { - return result_; + public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder getTeamChainSettleInfoBuilder() { + return getTeamChainSettleInfoFieldBuilder().getBuilder(); } /** - * uint32 result = 14; - * @param value The result to set. - * @return This builder for chaining. + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; */ - public Builder setResult(int value) { - - result_ = value; - onChanged(); - return this; + @java.lang.Override + public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder getTeamChainSettleInfoOrBuilder() { + if ((detailCase_ == 1217) && (teamChainSettleInfoBuilder_ != null)) { + return teamChainSettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 1217) { + return (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_; + } + return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance(); + } } /** - * uint32 result = 14; - * @return This builder for chaining. + * 
+       * JOOKFDDLIEM bomber_dodoco_settle_info = 1213;
+       *
+ * + * .TeamChainSettleInfo team_chain_settle_info = 1217; */ - public Builder clearResult() { - - result_ = 0; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder> + getTeamChainSettleInfoFieldBuilder() { + if (teamChainSettleInfoBuilder_ == null) { + if (!(detailCase_ == 1217)) { + detail_ = emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance(); + } + teamChainSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 1217; + onChanged();; + return teamChainSettleInfoBuilder_; } private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder> towerLevelEndNotifyBuilder_; + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder> windFieldDungeonSettleInfoBuilder_; /** - * .TowerLevelEndNotify tower_level_end_notify = 682; - * @return Whether the towerLevelEndNotify field is set. + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; + * @return Whether the windFieldDungeonSettleInfo field is set. */ @java.lang.Override - public boolean hasTowerLevelEndNotify() { - return detailCase_ == 682; + public boolean hasWindFieldDungeonSettleInfo() { + return detailCase_ == 1685; } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; - * @return The towerLevelEndNotify. + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; + * @return The windFieldDungeonSettleInfo. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify getTowerLevelEndNotify() { - if (towerLevelEndNotifyBuilder_ == null) { - if (detailCase_ == 682) { - return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_; + public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo getWindFieldDungeonSettleInfo() { + if (windFieldDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 1685) { + return (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_; } - return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance(); } else { - if (detailCase_ == 682) { - return towerLevelEndNotifyBuilder_.getMessage(); + if (detailCase_ == 1685) { + return windFieldDungeonSettleInfoBuilder_.getMessage(); } - return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance(); } } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; */ - public Builder setTowerLevelEndNotify(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify value) { - if (towerLevelEndNotifyBuilder_ == null) { + public Builder setWindFieldDungeonSettleInfo(emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo value) { + if (windFieldDungeonSettleInfoBuilder_ == null) { if (value == null) { throw new NullPointerException(); } detail_ = value; onChanged(); } else { - towerLevelEndNotifyBuilder_.setMessage(value); + windFieldDungeonSettleInfoBuilder_.setMessage(value); } - detailCase_ = 682; + detailCase_ = 1685; return this; } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; */ - public Builder setTowerLevelEndNotify( - emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder builderForValue) { - if (towerLevelEndNotifyBuilder_ == null) { + public Builder setWindFieldDungeonSettleInfo( + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder builderForValue) { + if (windFieldDungeonSettleInfoBuilder_ == null) { detail_ = builderForValue.build(); onChanged(); } else { - towerLevelEndNotifyBuilder_.setMessage(builderForValue.build()); + windFieldDungeonSettleInfoBuilder_.setMessage(builderForValue.build()); } - detailCase_ = 682; + detailCase_ = 1685; return this; } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; */ - public Builder mergeTowerLevelEndNotify(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify value) { - if (towerLevelEndNotifyBuilder_ == null) { - if (detailCase_ == 682 && - detail_ != emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance()) { - detail_ = emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.newBuilder((emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_) + public Builder mergeWindFieldDungeonSettleInfo(emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo value) { + if (windFieldDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 1685 && + detail_ != emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_) .mergeFrom(value).buildPartial(); } else { detail_ = value; } onChanged(); } else { - if (detailCase_ == 682) { - towerLevelEndNotifyBuilder_.mergeFrom(value); + if (detailCase_ == 1685) { + windFieldDungeonSettleInfoBuilder_.mergeFrom(value); } - towerLevelEndNotifyBuilder_.setMessage(value); + windFieldDungeonSettleInfoBuilder_.setMessage(value); } - detailCase_ = 682; + detailCase_ = 1685; return this; } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; */ - public Builder clearTowerLevelEndNotify() { - if (towerLevelEndNotifyBuilder_ == null) { - if (detailCase_ == 682) { + public Builder clearWindFieldDungeonSettleInfo() { + if (windFieldDungeonSettleInfoBuilder_ == null) { + if (detailCase_ == 1685) { detailCase_ = 0; detail_ = null; onChanged(); } } else { - if (detailCase_ == 682) { + if (detailCase_ == 1685) { detailCase_ = 0; detail_ = null; } - towerLevelEndNotifyBuilder_.clear(); + windFieldDungeonSettleInfoBuilder_.clear(); } return this; } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; */ - public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder getTowerLevelEndNotifyBuilder() { - return getTowerLevelEndNotifyFieldBuilder().getBuilder(); + public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder getWindFieldDungeonSettleInfoBuilder() { + return getWindFieldDungeonSettleInfoFieldBuilder().getBuilder(); } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder getTowerLevelEndNotifyOrBuilder() { - if ((detailCase_ == 682) && (towerLevelEndNotifyBuilder_ != null)) { - return towerLevelEndNotifyBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder getWindFieldDungeonSettleInfoOrBuilder() { + if ((detailCase_ == 1685) && (windFieldDungeonSettleInfoBuilder_ != null)) { + return windFieldDungeonSettleInfoBuilder_.getMessageOrBuilder(); } else { - if (detailCase_ == 682) { - return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_; + if (detailCase_ == 1685) { + return (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_; } - return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance(); } } /** - * .TowerLevelEndNotify tower_level_end_notify = 682; + * 
+       * PELIHNFBHII acrobatics_battle_settle_info = 1354;
+       * HPBLFCNDDAH filmfest_battle_settle_info = 1399;
+       * BPKPOIKNJKI role_combat_settle_info = 1461;
+       * FJHBJODAPMI char_master_settle_info = 1497;
+       * EIHAKHJEJPL quick_time_combat_settle_info = 1641;
+       * PBODMIJNHPG slime_cannon_settle_info = 1660;
+       *
+ * + * .WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 1685; */ private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder> - getTowerLevelEndNotifyFieldBuilder() { - if (towerLevelEndNotifyBuilder_ == null) { - if (!(detailCase_ == 682)) { - detail_ = emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance(); + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder> + getWindFieldDungeonSettleInfoFieldBuilder() { + if (windFieldDungeonSettleInfoBuilder_ == null) { + if (!(detailCase_ == 1685)) { + detail_ = emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance(); } - towerLevelEndNotifyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder>( - (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_, + windFieldDungeonSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_, getParentForChildren(), isClean()); detail_ = null; } - detailCase_ = 682; + detailCase_ = 1685; onChanged();; - return towerLevelEndNotifyBuilder_; + return windFieldDungeonSettleInfoBuilder_; } private com.google.protobuf.SingleFieldBuilderV3< @@ -2504,6 +6017,183 @@ public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.Tri onChanged();; return trialAvatarFirstPassDungeonNotifyBuilder_; } + + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder> pacmanSettleInfoBuilder_; + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + * @return Whether the pacmanSettleInfo field is set. + */ + @java.lang.Override + public boolean hasPacmanSettleInfo() { + return detailCase_ == 1970; + } + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + * @return The pacmanSettleInfo. + */ + @java.lang.Override + public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo getPacmanSettleInfo() { + if (pacmanSettleInfoBuilder_ == null) { + if (detailCase_ == 1970) { + return (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_; + } + return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance(); + } else { + if (detailCase_ == 1970) { + return pacmanSettleInfoBuilder_.getMessage(); + } + return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + public Builder setPacmanSettleInfo(emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo value) { + if (pacmanSettleInfoBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + detail_ = value; + onChanged(); + } else { + pacmanSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 1970; + return this; + } + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + public Builder setPacmanSettleInfo( + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder builderForValue) { + if (pacmanSettleInfoBuilder_ == null) { + detail_ = builderForValue.build(); + onChanged(); + } else { + pacmanSettleInfoBuilder_.setMessage(builderForValue.build()); + } + detailCase_ = 1970; + return this; + } + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + public Builder mergePacmanSettleInfo(emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo value) { + if (pacmanSettleInfoBuilder_ == null) { + if (detailCase_ == 1970 && + detail_ != emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance()) { + detail_ = emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.newBuilder((emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_) + .mergeFrom(value).buildPartial(); + } else { + detail_ = value; + } + onChanged(); + } else { + if (detailCase_ == 1970) { + pacmanSettleInfoBuilder_.mergeFrom(value); + } + pacmanSettleInfoBuilder_.setMessage(value); + } + detailCase_ = 1970; + return this; + } + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + public Builder clearPacmanSettleInfo() { + if (pacmanSettleInfoBuilder_ == null) { + if (detailCase_ == 1970) { + detailCase_ = 0; + detail_ = null; + onChanged(); + } + } else { + if (detailCase_ == 1970) { + detailCase_ = 0; + detail_ = null; + } + pacmanSettleInfoBuilder_.clear(); + } + return this; + } + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder getPacmanSettleInfoBuilder() { + return getPacmanSettleInfoFieldBuilder().getBuilder(); + } + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + @java.lang.Override + public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder getPacmanSettleInfoOrBuilder() { + if ((detailCase_ == 1970) && (pacmanSettleInfoBuilder_ != null)) { + return pacmanSettleInfoBuilder_.getMessageOrBuilder(); + } else { + if (detailCase_ == 1970) { + return (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_; + } + return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance(); + } + } + /** + * 
+       * JBIMMJPOEBA gain_buff_settle_info = 2002;
+       *
+ * + * .PacmanSettleInfo pacman_settle_info = 1970; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder> + getPacmanSettleInfoFieldBuilder() { + if (pacmanSettleInfoBuilder_ == null) { + if (!(detailCase_ == 1970)) { + detail_ = emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance(); + } + pacmanSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder>( + (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_, + getParentForChildren(), + isClean()); + detail_ = null; + } + detailCase_ = 1970; + onChanged();; + return pacmanSettleInfoBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -2581,45 +6271,92 @@ public emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNoti descriptor; static { java.lang.String[] descriptorData = { - "\n\031DungeonSettleNotify.proto\032\031StrengthenP" + - "ointData.proto\032!DungeonSettleExhibitionI" + - "nfo.proto\032\017ParamList.proto\032\031TowerLevelEn" + + "\n\031DungeonSettleNotify.proto\032!DungeonSett" + + "leExhibitionInfo.proto\032\031StrengthenPointD" + + "ata.proto\032\017ParamList.proto\032\031TowerLevelEn" + "dNotify.proto\032\'TrialAvatarFirstPassDunge" + - "onNotify.proto\"\240\005\n\023DungeonSettleNotify\022S" + - "\n\031strengthen_point_data_map\030\001 \003(\01320.Dung" + - "eonSettleNotify.StrengthenPointDataMapEn" + - "try\022\022\n\nis_success\030\004 \001(\010\022\026\n\016fail_cond_lis" + - "t\030\005 \003(\r\022:\n\024exhibition_info_list\030\006 \003(\0132\034." + - "DungeonSettleExhibitionInfo\022\022\n\ndungeon_i" + - "d\030\010 \001(\r\022\020\n\010use_time\030\t \001(\r\022\022\n\nclose_time\030" + - "\n \001(\r\0229\n\013settle_show\030\013 \003(\0132$.DungeonSett" + - "leNotify.SettleShowEntry\022\031\n\021create_playe" + - "r_uid\030\014 \001(\r\022\016\n\006result\030\016 \001(\r\0227\n\026tower_lev" + - "el_end_notify\030\252\005 \001(\0132\024.TowerLevelEndNoti" + - "fyH\000\022U\n&trial_avatar_first_pass_dungeon_" + - "notify\030\202\017 \001(\0132\".TrialAvatarFirstPassDung" + - "eonNotifyH\000\032S\n\033StrengthenPointDataMapEnt" + - "ry\022\013\n\003key\030\001 \001(\r\022#\n\005value\030\002 \001(\0132\024.Strengt" + - "henPointData:\0028\001\032=\n\017SettleShowEntry\022\013\n\003k" + - "ey\030\001 \001(\r\022\031\n\005value\030\002 \001(\0132\n.ParamList:\0028\001B" + - "\010\n\006detailB\033\n\031emu.grasscutter.net.protob\006" + - "proto3" + "onNotify.proto\032)ChannellerSlabLoopDungeo" + + "nResultInfo.proto\032&EffigyChallengeDungeo" + + "nResultInfo.proto\032 RoguelikeDungeonSettl" + + "eInfo.proto\032\"CrystalLinkDungeonSettleInf" + + "o.proto\032#SummerTimeV2DungeonSettleInfo.p" + + "roto\032$InstableSprayDungeonSettleInfo.pro" + + "to\032 WindFieldDungeonSettleInfo.proto\032!Ef" + + "figyChallengeV2SettleInfo.proto\032\031TeamCha" + + "inSettleInfo.proto\032\026PacmanSettleInfo.pro" + + "to\032\037FungusFighterV2SettleInfo.proto\032\032Bla" + + "deDanceSettleInfo.proto\032%MultiCharacterD" + + "ungeonSettleInfo.proto\"\304\014\n\023DungeonSettle" + + "Notify\022S\n\031strengthen_point_data_map\030\001 \003(" + + "\01320.DungeonSettleNotify.StrengthenPointD" + + "ataMapEntry\022\022\n\nis_success\030\004 \001(\010\022\026\n\016fail_" + + "cond_list\030\005 \003(\r\022:\n\024exhibition_info_list\030" + + "\006 \003(\0132\034.DungeonSettleExhibitionInfo\022\022\n\nd" + + "ungeon_id\030\010 \001(\r\022\020\n\010use_time\030\t \001(\r\022\022\n\nclo" + + "se_time\030\n \001(\r\0229\n\013settle_show\030\013 \003(\0132$.Dun" + + "geonSettleNotify.SettleShowEntry\022\031\n\021crea" + + "te_player_uid\030\014 \001(\r\022\016\n\006result\030\016 \001(\r\022N\n#s" + + "ummer_time_v_2_dungeon_settle_info\030\242\001 \001(" + + "\0132\036.SummerTimeV2DungeonSettleInfoH\000\0229\n\027b" + + "lade_dance_settle_info\030\244\001 \001(\0132\025.BladeDan" + + "ceSettleInfoH\000\022I\n effigy_challenge_v_2_s" + + "ettle_info\030\363\001 \001(\0132\034.EffigyChallengeV2Set" + + "tleInfoH\000\022Y\n(channeller_slab_loop_dungeo" + + "n_result_info\030\223\002 \001(\0132$.ChannellerSlabLoo" + + "pDungeonResultInfoH\000\022E\n\035roguelike_dungeo" + + "n_settle_info\030\351\004 \001(\0132\033.RoguelikeDungeonS" + + "ettleInfoH\000\0227\n\026tower_level_end_notify\030\252\005" + + " \001(\0132\024.TowerLevelEndNotifyH\000\022B\n\030crystal_" + + "link_settle_info\030\307\005 \001(\0132\035.CrystalLinkDun" + + "geonSettleInfoH\000\022F\n\032instable_spray_settl" + + "e_info\030\342\005 \001(\0132\037.InstableSprayDungeonSett" + + "leInfoH\000\022E\n\036fungus_fighter_v_2_settle_in" + + "fo\030\354\007 \001(\0132\032.FungusFighterV2SettleInfoH\000\022" + + "R\n$effigy_challenge_dungeon_result_info\030" + + "\242\t \001(\0132!.EffigyChallengeDungeonResultInf" + + "oH\000\022P\n#multi_character_dungeon_settle_in" + + "fo\030\261\t \001(\0132 .MultiCharacterDungeonSettleI" + + "nfoH\000\0227\n\026team_chain_settle_info\030\301\t \001(\0132\024" + + ".TeamChainSettleInfoH\000\022F\n\036wind_field_dun" + + "geon_settle_info\030\225\r \001(\0132\033.WindFieldDunge" + + "onSettleInfoH\000\022U\n&trial_avatar_first_pas" + + "s_dungeon_notify\030\202\017 \001(\0132\".TrialAvatarFir" + + "stPassDungeonNotifyH\000\0220\n\022pacman_settle_i" + + "nfo\030\262\017 \001(\0132\021.PacmanSettleInfoH\000\032S\n\033Stren" + + "gthenPointDataMapEntry\022\013\n\003key\030\001 \001(\r\022#\n\005v" + + "alue\030\002 \001(\0132\024.StrengthenPointData:\0028\001\032=\n\017" + + "SettleShowEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030\002 " + + "\001(\0132\n.ParamList:\0028\001B\010\n\006detailB\033\n\031emu.gra" + + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(), emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(), emu.grasscutter.net.proto.ParamListOuterClass.getDescriptor(), emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.getDescriptor(), emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.getDescriptor(), + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.getDescriptor(), }); internal_static_DungeonSettleNotify_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_DungeonSettleNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonSettleNotify_descriptor, - new java.lang.String[] { "StrengthenPointDataMap", "IsSuccess", "FailCondList", "ExhibitionInfoList", "DungeonId", "UseTime", "CloseTime", "SettleShow", "CreatePlayerUid", "Result", "TowerLevelEndNotify", "TrialAvatarFirstPassDungeonNotify", "Detail", }); + new java.lang.String[] { "StrengthenPointDataMap", "IsSuccess", "FailCondList", "ExhibitionInfoList", "DungeonId", "UseTime", "CloseTime", "SettleShow", "CreatePlayerUid", "Result", "SummerTimeV2DungeonSettleInfo", "BladeDanceSettleInfo", "EffigyChallengeV2SettleInfo", "ChannellerSlabLoopDungeonResultInfo", "RoguelikeDungeonSettleInfo", "TowerLevelEndNotify", "CrystalLinkSettleInfo", "InstableSpraySettleInfo", "FungusFighterV2SettleInfo", "EffigyChallengeDungeonResultInfo", "MultiCharacterDungeonSettleInfo", "TeamChainSettleInfo", "WindFieldDungeonSettleInfo", "TrialAvatarFirstPassDungeonNotify", "PacmanSettleInfo", "Detail", }); internal_static_DungeonSettleNotify_StrengthenPointDataMapEntry_descriptor = internal_static_DungeonSettleNotify_descriptor.getNestedTypes().get(0); internal_static_DungeonSettleNotify_StrengthenPointDataMapEntry_fieldAccessorTable = new @@ -2632,11 +6369,24 @@ public emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNoti com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_DungeonSettleNotify_SettleShowEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(); emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(); emu.grasscutter.net.proto.ParamListOuterClass.getDescriptor(); emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.getDescriptor(); emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.getDescriptor(); + emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonWayPointNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonWayPointNotifyOuterClass.java index 6f075daf342..438607234bb 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonWayPointNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonWayPointNotifyOuterClass.java @@ -19,32 +19,32 @@ public interface DungeonWayPointNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @return A list containing the activeWayPointList. */ java.util.List getActiveWayPointListList(); /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @return The count of activeWayPointList. */ int getActiveWayPointListCount(); /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @param index The index of the element to return. * @return The activeWayPointList at the given index. */ int getActiveWayPointList(int index); /** - * bool is_add = 5; + * bool is_add = 13; * @return The isAdd. */ boolean getIsAdd(); } /** * 
-   * CmdId: 27817
-   * Obf: MKJAMAKFLLI
+   * CmdId: 3239
+   * obf: JMCKNHAEGKP
    *
* * Protobuf type {@code DungeonWayPointNotify} @@ -93,12 +93,7 @@ private DungeonWayPointNotify( case 0: done = true; break; - case 40: { - - isAdd_ = input.readBool(); - break; - } - case 48: { + case 24: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { activeWayPointList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -106,7 +101,7 @@ private DungeonWayPointNotify( activeWayPointList_.addInt(input.readUInt32()); break; } - case 50: { + case 26: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -119,6 +114,11 @@ private DungeonWayPointNotify( input.popLimit(limit); break; } + case 104: { + + isAdd_ = input.readBool(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -154,10 +154,10 @@ private DungeonWayPointNotify( emu.grasscutter.net.proto.DungeonWayPointNotifyOuterClass.DungeonWayPointNotify.class, emu.grasscutter.net.proto.DungeonWayPointNotifyOuterClass.DungeonWayPointNotify.Builder.class); } - public static final int ACTIVE_WAY_POINT_LIST_FIELD_NUMBER = 6; + public static final int ACTIVE_WAY_POINT_LIST_FIELD_NUMBER = 3; private com.google.protobuf.Internal.IntList activeWayPointList_; /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @return A list containing the activeWayPointList. */ @java.lang.Override @@ -166,14 +166,14 @@ private DungeonWayPointNotify( return activeWayPointList_; } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @return The count of activeWayPointList. */ public int getActiveWayPointListCount() { return activeWayPointList_.size(); } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @param index The index of the element to return. * @return The activeWayPointList at the given index. */ @@ -182,10 +182,10 @@ public int getActiveWayPointList(int index) { } private int activeWayPointListMemoizedSerializedSize = -1; - public static final int IS_ADD_FIELD_NUMBER = 5; + public static final int IS_ADD_FIELD_NUMBER = 13; private boolean isAdd_; /** - * bool is_add = 5; + * bool is_add = 13; * @return The isAdd. */ @java.lang.Override @@ -208,16 +208,16 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (isAdd_ != false) { - output.writeBool(5, isAdd_); - } if (getActiveWayPointListList().size() > 0) { - output.writeUInt32NoTag(50); + output.writeUInt32NoTag(26); output.writeUInt32NoTag(activeWayPointListMemoizedSerializedSize); } for (int i = 0; i < activeWayPointList_.size(); i++) { output.writeUInt32NoTag(activeWayPointList_.getInt(i)); } + if (isAdd_ != false) { + output.writeBool(13, isAdd_); + } unknownFields.writeTo(output); } @@ -227,10 +227,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (isAdd_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(5, isAdd_); - } { int dataSize = 0; for (int i = 0; i < activeWayPointList_.size(); i++) { @@ -245,6 +241,10 @@ public int getSerializedSize() { } activeWayPointListMemoizedSerializedSize = dataSize; } + if (isAdd_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(13, isAdd_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -379,8 +379,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27817
-     * Obf: MKJAMAKFLLI
+     * CmdId: 3239
+     * obf: JMCKNHAEGKP
      *
* * Protobuf type {@code DungeonWayPointNotify} @@ -556,7 +556,7 @@ private void ensureActiveWayPointListIsMutable() { } } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @return A list containing the activeWayPointList. */ public java.util.List @@ -565,14 +565,14 @@ private void ensureActiveWayPointListIsMutable() { java.util.Collections.unmodifiableList(activeWayPointList_) : activeWayPointList_; } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @return The count of activeWayPointList. */ public int getActiveWayPointListCount() { return activeWayPointList_.size(); } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @param index The index of the element to return. * @return The activeWayPointList at the given index. */ @@ -580,7 +580,7 @@ public int getActiveWayPointList(int index) { return activeWayPointList_.getInt(index); } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @param index The index to set the value at. * @param value The activeWayPointList to set. * @return This builder for chaining. @@ -593,7 +593,7 @@ public Builder setActiveWayPointList( return this; } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @param value The activeWayPointList to add. * @return This builder for chaining. */ @@ -604,7 +604,7 @@ public Builder addActiveWayPointList(int value) { return this; } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @param values The activeWayPointList to add. * @return This builder for chaining. */ @@ -617,7 +617,7 @@ public Builder addAllActiveWayPointList( return this; } /** - * repeated uint32 active_way_point_list = 6; + * repeated uint32 active_way_point_list = 3; * @return This builder for chaining. */ public Builder clearActiveWayPointList() { @@ -629,7 +629,7 @@ public Builder clearActiveWayPointList() { private boolean isAdd_ ; /** - * bool is_add = 5; + * bool is_add = 13; * @return The isAdd. */ @java.lang.Override @@ -637,7 +637,7 @@ public boolean getIsAdd() { return isAdd_; } /** - * bool is_add = 5; + * bool is_add = 13; * @param value The isAdd to set. * @return This builder for chaining. */ @@ -648,7 +648,7 @@ public Builder setIsAdd(boolean value) { return this; } /** - * bool is_add = 5; + * bool is_add = 13; * @return This builder for chaining. */ public Builder clearIsAdd() { @@ -726,7 +726,7 @@ public emu.grasscutter.net.proto.DungeonWayPointNotifyOuterClass.DungeonWayPoint java.lang.String[] descriptorData = { "\n\033DungeonWayPointNotify.proto\"F\n\025Dungeon" + "WayPointNotify\022\035\n\025active_way_point_list\030" + - "\006 \003(\r\022\016\n\006is_add\030\005 \001(\010B\033\n\031emu.grasscutter" + + "\003 \003(\r\022\016\n\006is_add\030\r \001(\010B\033\n\031emu.grasscutter" + ".net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV2SettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV2SettleInfoOuterClass.java index b37a8cf92ab..143861e69ab 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV2SettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV2SettleInfoOuterClass.java @@ -19,46 +19,42 @@ public interface EffigyChallengeV2SettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 CMCCNBNFAJE = 11; - * @return The cMCCNBNFAJE. + * uint32 KJJCCECPOFH = 4; + * @return The kJJCCECPOFH. */ - int getCMCCNBNFAJE(); + int getKJJCCECPOFH(); /** - * bool LFNCGGFLHPL = 9; - * @return The lFNCGGFLHPL. + * uint32 GDJKLHGOHIF = 5; + * @return The gDJKLHGOHIF. */ - boolean getLFNCGGFLHPL(); + int getGDJKLHGOHIF(); /** - * uint32 DCAKCNEDDEB = 12; - * @return The dCAKCNEDDEB. + * uint32 IADEOMKIMKB = 7; + * @return The iADEOMKIMKB. */ - int getDCAKCNEDDEB(); + int getIADEOMKIMKB(); /** - * uint32 challenge_mode_difficulty = 3; - * @return The challengeModeDifficulty. + * bool CLNJBIBJCMG = 11; + * @return The cLNJBIBJCMG. */ - int getChallengeModeDifficulty(); + boolean getCLNJBIBJCMG(); /** - * bool FOFHONJNIHG = 4; - * @return The fOFHONJNIHG. + * uint32 GJGHLMEKEHM = 12; + * @return The gJGHLMEKEHM. */ - boolean getFOFHONJNIHG(); + int getGJGHLMEKEHM(); /** - * uint32 PHNDBBLLHDI = 1; - * @return The pHNDBBLLHDI. + * bool JCOOJLJOPEH = 14; + * @return The jCOOJLJOPEH. */ - int getPHNDBBLLHDI(); + boolean getJCOOJLJOPEH(); } /** - * 
-   * Obf: GKEGGCBBJNB
-   *
- * * Protobuf type {@code EffigyChallengeV2SettleInfo} */ public static final class EffigyChallengeV2SettleInfo extends @@ -103,34 +99,34 @@ private EffigyChallengeV2SettleInfo( case 0: done = true; break; - case 8: { + case 32: { - pHNDBBLLHDI_ = input.readUInt32(); + kJJCCECPOFH_ = input.readUInt32(); break; } - case 24: { + case 40: { - challengeModeDifficulty_ = input.readUInt32(); + gDJKLHGOHIF_ = input.readUInt32(); break; } - case 32: { + case 56: { - fOFHONJNIHG_ = input.readBool(); + iADEOMKIMKB_ = input.readUInt32(); break; } - case 72: { + case 88: { - lFNCGGFLHPL_ = input.readBool(); + cLNJBIBJCMG_ = input.readBool(); break; } - case 88: { + case 96: { - cMCCNBNFAJE_ = input.readUInt32(); + gJGHLMEKEHM_ = input.readUInt32(); break; } - case 96: { + case 112: { - dCAKCNEDDEB_ = input.readUInt32(); + jCOOJLJOPEH_ = input.readBool(); break; } default: { @@ -165,70 +161,70 @@ private EffigyChallengeV2SettleInfo( emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.class, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder.class); } - public static final int CMCCNBNFAJE_FIELD_NUMBER = 11; - private int cMCCNBNFAJE_; + public static final int KJJCCECPOFH_FIELD_NUMBER = 4; + private int kJJCCECPOFH_; /** - * uint32 CMCCNBNFAJE = 11; - * @return The cMCCNBNFAJE. + * uint32 KJJCCECPOFH = 4; + * @return The kJJCCECPOFH. */ @java.lang.Override - public int getCMCCNBNFAJE() { - return cMCCNBNFAJE_; + public int getKJJCCECPOFH() { + return kJJCCECPOFH_; } - public static final int LFNCGGFLHPL_FIELD_NUMBER = 9; - private boolean lFNCGGFLHPL_; + public static final int GDJKLHGOHIF_FIELD_NUMBER = 5; + private int gDJKLHGOHIF_; /** - * bool LFNCGGFLHPL = 9; - * @return The lFNCGGFLHPL. + * uint32 GDJKLHGOHIF = 5; + * @return The gDJKLHGOHIF. */ @java.lang.Override - public boolean getLFNCGGFLHPL() { - return lFNCGGFLHPL_; + public int getGDJKLHGOHIF() { + return gDJKLHGOHIF_; } - public static final int DCAKCNEDDEB_FIELD_NUMBER = 12; - private int dCAKCNEDDEB_; + public static final int IADEOMKIMKB_FIELD_NUMBER = 7; + private int iADEOMKIMKB_; /** - * uint32 DCAKCNEDDEB = 12; - * @return The dCAKCNEDDEB. + * uint32 IADEOMKIMKB = 7; + * @return The iADEOMKIMKB. */ @java.lang.Override - public int getDCAKCNEDDEB() { - return dCAKCNEDDEB_; + public int getIADEOMKIMKB() { + return iADEOMKIMKB_; } - public static final int CHALLENGE_MODE_DIFFICULTY_FIELD_NUMBER = 3; - private int challengeModeDifficulty_; + public static final int CLNJBIBJCMG_FIELD_NUMBER = 11; + private boolean cLNJBIBJCMG_; /** - * uint32 challenge_mode_difficulty = 3; - * @return The challengeModeDifficulty. + * bool CLNJBIBJCMG = 11; + * @return The cLNJBIBJCMG. */ @java.lang.Override - public int getChallengeModeDifficulty() { - return challengeModeDifficulty_; + public boolean getCLNJBIBJCMG() { + return cLNJBIBJCMG_; } - public static final int FOFHONJNIHG_FIELD_NUMBER = 4; - private boolean fOFHONJNIHG_; + public static final int GJGHLMEKEHM_FIELD_NUMBER = 12; + private int gJGHLMEKEHM_; /** - * bool FOFHONJNIHG = 4; - * @return The fOFHONJNIHG. + * uint32 GJGHLMEKEHM = 12; + * @return The gJGHLMEKEHM. */ @java.lang.Override - public boolean getFOFHONJNIHG() { - return fOFHONJNIHG_; + public int getGJGHLMEKEHM() { + return gJGHLMEKEHM_; } - public static final int PHNDBBLLHDI_FIELD_NUMBER = 1; - private int pHNDBBLLHDI_; + public static final int JCOOJLJOPEH_FIELD_NUMBER = 14; + private boolean jCOOJLJOPEH_; /** - * uint32 PHNDBBLLHDI = 1; - * @return The pHNDBBLLHDI. + * bool JCOOJLJOPEH = 14; + * @return The jCOOJLJOPEH. */ @java.lang.Override - public int getPHNDBBLLHDI() { - return pHNDBBLLHDI_; + public boolean getJCOOJLJOPEH() { + return jCOOJLJOPEH_; } private byte memoizedIsInitialized = -1; @@ -245,23 +241,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (pHNDBBLLHDI_ != 0) { - output.writeUInt32(1, pHNDBBLLHDI_); + if (kJJCCECPOFH_ != 0) { + output.writeUInt32(4, kJJCCECPOFH_); } - if (challengeModeDifficulty_ != 0) { - output.writeUInt32(3, challengeModeDifficulty_); + if (gDJKLHGOHIF_ != 0) { + output.writeUInt32(5, gDJKLHGOHIF_); } - if (fOFHONJNIHG_ != false) { - output.writeBool(4, fOFHONJNIHG_); + if (iADEOMKIMKB_ != 0) { + output.writeUInt32(7, iADEOMKIMKB_); } - if (lFNCGGFLHPL_ != false) { - output.writeBool(9, lFNCGGFLHPL_); + if (cLNJBIBJCMG_ != false) { + output.writeBool(11, cLNJBIBJCMG_); } - if (cMCCNBNFAJE_ != 0) { - output.writeUInt32(11, cMCCNBNFAJE_); + if (gJGHLMEKEHM_ != 0) { + output.writeUInt32(12, gJGHLMEKEHM_); } - if (dCAKCNEDDEB_ != 0) { - output.writeUInt32(12, dCAKCNEDDEB_); + if (jCOOJLJOPEH_ != false) { + output.writeBool(14, jCOOJLJOPEH_); } unknownFields.writeTo(output); } @@ -272,29 +268,29 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (pHNDBBLLHDI_ != 0) { + if (kJJCCECPOFH_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, pHNDBBLLHDI_); + .computeUInt32Size(4, kJJCCECPOFH_); } - if (challengeModeDifficulty_ != 0) { + if (gDJKLHGOHIF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, challengeModeDifficulty_); + .computeUInt32Size(5, gDJKLHGOHIF_); } - if (fOFHONJNIHG_ != false) { + if (iADEOMKIMKB_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, fOFHONJNIHG_); + .computeUInt32Size(7, iADEOMKIMKB_); } - if (lFNCGGFLHPL_ != false) { + if (cLNJBIBJCMG_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(9, lFNCGGFLHPL_); + .computeBoolSize(11, cLNJBIBJCMG_); } - if (cMCCNBNFAJE_ != 0) { + if (gJGHLMEKEHM_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, cMCCNBNFAJE_); + .computeUInt32Size(12, gJGHLMEKEHM_); } - if (dCAKCNEDDEB_ != 0) { + if (jCOOJLJOPEH_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, dCAKCNEDDEB_); + .computeBoolSize(14, jCOOJLJOPEH_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -311,18 +307,18 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo other = (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) obj; - if (getCMCCNBNFAJE() - != other.getCMCCNBNFAJE()) return false; - if (getLFNCGGFLHPL() - != other.getLFNCGGFLHPL()) return false; - if (getDCAKCNEDDEB() - != other.getDCAKCNEDDEB()) return false; - if (getChallengeModeDifficulty() - != other.getChallengeModeDifficulty()) return false; - if (getFOFHONJNIHG() - != other.getFOFHONJNIHG()) return false; - if (getPHNDBBLLHDI() - != other.getPHNDBBLLHDI()) return false; + if (getKJJCCECPOFH() + != other.getKJJCCECPOFH()) return false; + if (getGDJKLHGOHIF() + != other.getGDJKLHGOHIF()) return false; + if (getIADEOMKIMKB() + != other.getIADEOMKIMKB()) return false; + if (getCLNJBIBJCMG() + != other.getCLNJBIBJCMG()) return false; + if (getGJGHLMEKEHM() + != other.getGJGHLMEKEHM()) return false; + if (getJCOOJLJOPEH() + != other.getJCOOJLJOPEH()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -334,20 +330,20 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + CMCCNBNFAJE_FIELD_NUMBER; - hash = (53 * hash) + getCMCCNBNFAJE(); - hash = (37 * hash) + LFNCGGFLHPL_FIELD_NUMBER; + hash = (37 * hash) + KJJCCECPOFH_FIELD_NUMBER; + hash = (53 * hash) + getKJJCCECPOFH(); + hash = (37 * hash) + GDJKLHGOHIF_FIELD_NUMBER; + hash = (53 * hash) + getGDJKLHGOHIF(); + hash = (37 * hash) + IADEOMKIMKB_FIELD_NUMBER; + hash = (53 * hash) + getIADEOMKIMKB(); + hash = (37 * hash) + CLNJBIBJCMG_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getLFNCGGFLHPL()); - hash = (37 * hash) + DCAKCNEDDEB_FIELD_NUMBER; - hash = (53 * hash) + getDCAKCNEDDEB(); - hash = (37 * hash) + CHALLENGE_MODE_DIFFICULTY_FIELD_NUMBER; - hash = (53 * hash) + getChallengeModeDifficulty(); - hash = (37 * hash) + FOFHONJNIHG_FIELD_NUMBER; + getCLNJBIBJCMG()); + hash = (37 * hash) + GJGHLMEKEHM_FIELD_NUMBER; + hash = (53 * hash) + getGJGHLMEKEHM(); + hash = (37 * hash) + JCOOJLJOPEH_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getFOFHONJNIHG()); - hash = (37 * hash) + PHNDBBLLHDI_FIELD_NUMBER; - hash = (53 * hash) + getPHNDBBLLHDI(); + getJCOOJLJOPEH()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -444,10 +440,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: GKEGGCBBJNB
-     *
- * * Protobuf type {@code EffigyChallengeV2SettleInfo} */ public static final class Builder extends @@ -485,17 +477,17 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - cMCCNBNFAJE_ = 0; + kJJCCECPOFH_ = 0; - lFNCGGFLHPL_ = false; + gDJKLHGOHIF_ = 0; - dCAKCNEDDEB_ = 0; + iADEOMKIMKB_ = 0; - challengeModeDifficulty_ = 0; + cLNJBIBJCMG_ = false; - fOFHONJNIHG_ = false; + gJGHLMEKEHM_ = 0; - pHNDBBLLHDI_ = 0; + jCOOJLJOPEH_ = false; return this; } @@ -523,12 +515,12 @@ public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyCha @java.lang.Override public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo buildPartial() { emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo result = new emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo(this); - result.cMCCNBNFAJE_ = cMCCNBNFAJE_; - result.lFNCGGFLHPL_ = lFNCGGFLHPL_; - result.dCAKCNEDDEB_ = dCAKCNEDDEB_; - result.challengeModeDifficulty_ = challengeModeDifficulty_; - result.fOFHONJNIHG_ = fOFHONJNIHG_; - result.pHNDBBLLHDI_ = pHNDBBLLHDI_; + result.kJJCCECPOFH_ = kJJCCECPOFH_; + result.gDJKLHGOHIF_ = gDJKLHGOHIF_; + result.iADEOMKIMKB_ = iADEOMKIMKB_; + result.cLNJBIBJCMG_ = cLNJBIBJCMG_; + result.gJGHLMEKEHM_ = gJGHLMEKEHM_; + result.jCOOJLJOPEH_ = jCOOJLJOPEH_; onBuilt(); return result; } @@ -577,23 +569,23 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo other) { if (other == emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance()) return this; - if (other.getCMCCNBNFAJE() != 0) { - setCMCCNBNFAJE(other.getCMCCNBNFAJE()); + if (other.getKJJCCECPOFH() != 0) { + setKJJCCECPOFH(other.getKJJCCECPOFH()); } - if (other.getLFNCGGFLHPL() != false) { - setLFNCGGFLHPL(other.getLFNCGGFLHPL()); + if (other.getGDJKLHGOHIF() != 0) { + setGDJKLHGOHIF(other.getGDJKLHGOHIF()); } - if (other.getDCAKCNEDDEB() != 0) { - setDCAKCNEDDEB(other.getDCAKCNEDDEB()); + if (other.getIADEOMKIMKB() != 0) { + setIADEOMKIMKB(other.getIADEOMKIMKB()); } - if (other.getChallengeModeDifficulty() != 0) { - setChallengeModeDifficulty(other.getChallengeModeDifficulty()); + if (other.getCLNJBIBJCMG() != false) { + setCLNJBIBJCMG(other.getCLNJBIBJCMG()); } - if (other.getFOFHONJNIHG() != false) { - setFOFHONJNIHG(other.getFOFHONJNIHG()); + if (other.getGJGHLMEKEHM() != 0) { + setGJGHLMEKEHM(other.getGJGHLMEKEHM()); } - if (other.getPHNDBBLLHDI() != 0) { - setPHNDBBLLHDI(other.getPHNDBBLLHDI()); + if (other.getJCOOJLJOPEH() != false) { + setJCOOJLJOPEH(other.getJCOOJLJOPEH()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -624,188 +616,188 @@ public Builder mergeFrom( return this; } - private int cMCCNBNFAJE_ ; + private int kJJCCECPOFH_ ; /** - * uint32 CMCCNBNFAJE = 11; - * @return The cMCCNBNFAJE. + * uint32 KJJCCECPOFH = 4; + * @return The kJJCCECPOFH. */ @java.lang.Override - public int getCMCCNBNFAJE() { - return cMCCNBNFAJE_; + public int getKJJCCECPOFH() { + return kJJCCECPOFH_; } /** - * uint32 CMCCNBNFAJE = 11; - * @param value The cMCCNBNFAJE to set. + * uint32 KJJCCECPOFH = 4; + * @param value The kJJCCECPOFH to set. * @return This builder for chaining. */ - public Builder setCMCCNBNFAJE(int value) { + public Builder setKJJCCECPOFH(int value) { - cMCCNBNFAJE_ = value; + kJJCCECPOFH_ = value; onChanged(); return this; } /** - * uint32 CMCCNBNFAJE = 11; + * uint32 KJJCCECPOFH = 4; * @return This builder for chaining. */ - public Builder clearCMCCNBNFAJE() { + public Builder clearKJJCCECPOFH() { - cMCCNBNFAJE_ = 0; + kJJCCECPOFH_ = 0; onChanged(); return this; } - private boolean lFNCGGFLHPL_ ; + private int gDJKLHGOHIF_ ; /** - * bool LFNCGGFLHPL = 9; - * @return The lFNCGGFLHPL. + * uint32 GDJKLHGOHIF = 5; + * @return The gDJKLHGOHIF. */ @java.lang.Override - public boolean getLFNCGGFLHPL() { - return lFNCGGFLHPL_; + public int getGDJKLHGOHIF() { + return gDJKLHGOHIF_; } /** - * bool LFNCGGFLHPL = 9; - * @param value The lFNCGGFLHPL to set. + * uint32 GDJKLHGOHIF = 5; + * @param value The gDJKLHGOHIF to set. * @return This builder for chaining. */ - public Builder setLFNCGGFLHPL(boolean value) { + public Builder setGDJKLHGOHIF(int value) { - lFNCGGFLHPL_ = value; + gDJKLHGOHIF_ = value; onChanged(); return this; } /** - * bool LFNCGGFLHPL = 9; + * uint32 GDJKLHGOHIF = 5; * @return This builder for chaining. */ - public Builder clearLFNCGGFLHPL() { + public Builder clearGDJKLHGOHIF() { - lFNCGGFLHPL_ = false; + gDJKLHGOHIF_ = 0; onChanged(); return this; } - private int dCAKCNEDDEB_ ; + private int iADEOMKIMKB_ ; /** - * uint32 DCAKCNEDDEB = 12; - * @return The dCAKCNEDDEB. + * uint32 IADEOMKIMKB = 7; + * @return The iADEOMKIMKB. */ @java.lang.Override - public int getDCAKCNEDDEB() { - return dCAKCNEDDEB_; + public int getIADEOMKIMKB() { + return iADEOMKIMKB_; } /** - * uint32 DCAKCNEDDEB = 12; - * @param value The dCAKCNEDDEB to set. + * uint32 IADEOMKIMKB = 7; + * @param value The iADEOMKIMKB to set. * @return This builder for chaining. */ - public Builder setDCAKCNEDDEB(int value) { + public Builder setIADEOMKIMKB(int value) { - dCAKCNEDDEB_ = value; + iADEOMKIMKB_ = value; onChanged(); return this; } /** - * uint32 DCAKCNEDDEB = 12; + * uint32 IADEOMKIMKB = 7; * @return This builder for chaining. */ - public Builder clearDCAKCNEDDEB() { + public Builder clearIADEOMKIMKB() { - dCAKCNEDDEB_ = 0; + iADEOMKIMKB_ = 0; onChanged(); return this; } - private int challengeModeDifficulty_ ; + private boolean cLNJBIBJCMG_ ; /** - * uint32 challenge_mode_difficulty = 3; - * @return The challengeModeDifficulty. + * bool CLNJBIBJCMG = 11; + * @return The cLNJBIBJCMG. */ @java.lang.Override - public int getChallengeModeDifficulty() { - return challengeModeDifficulty_; + public boolean getCLNJBIBJCMG() { + return cLNJBIBJCMG_; } /** - * uint32 challenge_mode_difficulty = 3; - * @param value The challengeModeDifficulty to set. + * bool CLNJBIBJCMG = 11; + * @param value The cLNJBIBJCMG to set. * @return This builder for chaining. */ - public Builder setChallengeModeDifficulty(int value) { + public Builder setCLNJBIBJCMG(boolean value) { - challengeModeDifficulty_ = value; + cLNJBIBJCMG_ = value; onChanged(); return this; } /** - * uint32 challenge_mode_difficulty = 3; + * bool CLNJBIBJCMG = 11; * @return This builder for chaining. */ - public Builder clearChallengeModeDifficulty() { + public Builder clearCLNJBIBJCMG() { - challengeModeDifficulty_ = 0; + cLNJBIBJCMG_ = false; onChanged(); return this; } - private boolean fOFHONJNIHG_ ; + private int gJGHLMEKEHM_ ; /** - * bool FOFHONJNIHG = 4; - * @return The fOFHONJNIHG. + * uint32 GJGHLMEKEHM = 12; + * @return The gJGHLMEKEHM. */ @java.lang.Override - public boolean getFOFHONJNIHG() { - return fOFHONJNIHG_; + public int getGJGHLMEKEHM() { + return gJGHLMEKEHM_; } /** - * bool FOFHONJNIHG = 4; - * @param value The fOFHONJNIHG to set. + * uint32 GJGHLMEKEHM = 12; + * @param value The gJGHLMEKEHM to set. * @return This builder for chaining. */ - public Builder setFOFHONJNIHG(boolean value) { + public Builder setGJGHLMEKEHM(int value) { - fOFHONJNIHG_ = value; + gJGHLMEKEHM_ = value; onChanged(); return this; } /** - * bool FOFHONJNIHG = 4; + * uint32 GJGHLMEKEHM = 12; * @return This builder for chaining. */ - public Builder clearFOFHONJNIHG() { + public Builder clearGJGHLMEKEHM() { - fOFHONJNIHG_ = false; + gJGHLMEKEHM_ = 0; onChanged(); return this; } - private int pHNDBBLLHDI_ ; + private boolean jCOOJLJOPEH_ ; /** - * uint32 PHNDBBLLHDI = 1; - * @return The pHNDBBLLHDI. + * bool JCOOJLJOPEH = 14; + * @return The jCOOJLJOPEH. */ @java.lang.Override - public int getPHNDBBLLHDI() { - return pHNDBBLLHDI_; + public boolean getJCOOJLJOPEH() { + return jCOOJLJOPEH_; } /** - * uint32 PHNDBBLLHDI = 1; - * @param value The pHNDBBLLHDI to set. + * bool JCOOJLJOPEH = 14; + * @param value The jCOOJLJOPEH to set. * @return This builder for chaining. */ - public Builder setPHNDBBLLHDI(int value) { + public Builder setJCOOJLJOPEH(boolean value) { - pHNDBBLLHDI_ = value; + jCOOJLJOPEH_ = value; onChanged(); return this; } /** - * uint32 PHNDBBLLHDI = 1; + * bool JCOOJLJOPEH = 14; * @return This builder for chaining. */ - public Builder clearPHNDBBLLHDI() { + public Builder clearJCOOJLJOPEH() { - pHNDBBLLHDI_ = 0; + jCOOJLJOPEH_ = false; onChanged(); return this; } @@ -876,13 +868,12 @@ public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyCha descriptor; static { java.lang.String[] descriptorData = { - "\n!EffigyChallengeV2SettleInfo.proto\"\251\001\n\033" + - "EffigyChallengeV2SettleInfo\022\023\n\013CMCCNBNFA" + - "JE\030\013 \001(\r\022\023\n\013LFNCGGFLHPL\030\t \001(\010\022\023\n\013DCAKCNE" + - "DDEB\030\014 \001(\r\022!\n\031challenge_mode_difficulty\030" + - "\003 \001(\r\022\023\n\013FOFHONJNIHG\030\004 \001(\010\022\023\n\013PHNDBBLLHD" + - "I\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" + - "oto3" + "\n!EffigyChallengeV2SettleInfo.proto\"\233\001\n\033" + + "EffigyChallengeV2SettleInfo\022\023\n\013KJJCCECPO" + + "FH\030\004 \001(\r\022\023\n\013GDJKLHGOHIF\030\005 \001(\r\022\023\n\013IADEOMK" + + "IMKB\030\007 \001(\r\022\023\n\013CLNJBIBJCMG\030\013 \001(\010\022\023\n\013GJGHL" + + "MEKEHM\030\014 \001(\r\022\023\n\013JCOOJLJOPEH\030\016 \001(\010B\033\n\031emu" + + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -893,7 +884,7 @@ public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyCha internal_static_EffigyChallengeV2SettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_EffigyChallengeV2SettleInfo_descriptor, - new java.lang.String[] { "CMCCNBNFAJE", "LFNCGGFLHPL", "DCAKCNEDDEB", "ChallengeModeDifficulty", "FOFHONJNIHG", "PHNDBBLLHDI", }); + new java.lang.String[] { "KJJCCECPOFH", "GDJKLHGOHIF", "IADEOMKIMKB", "CLNJBIBJCMG", "GJGHLMEKEHM", "JCOOJLJOPEH", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterTransPointRegionNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterTransPointRegionNotifyOuterClass.java index fa57f0df418..9dad1863bb2 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EnterTransPointRegionNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterTransPointRegionNotifyOuterClass.java @@ -19,21 +19,22 @@ public interface EnterTransPointRegionNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 point_id = 5; - * @return The pointId. + * uint32 scene_id = 5; + * @return The sceneId. */ - int getPointId(); + int getSceneId(); /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 point_id = 8; + * @return The pointId. */ - int getSceneId(); + int getPointId(); } /** * 
-   * CmdId: 22064
-   * Obf: ECDCICGGBDA
+   * CmdId: 9692
+   * obf: PDEMNLNIIOM
+   * 5.0
    *
* * Protobuf type {@code EnterTransPointRegionNotify} @@ -82,12 +83,12 @@ private EnterTransPointRegionNotify( break; case 40: { - pointId_ = input.readUInt32(); + sceneId_ = input.readUInt32(); break; } - case 96: { + case 64: { - sceneId_ = input.readUInt32(); + pointId_ = input.readUInt32(); break; } default: { @@ -122,26 +123,26 @@ private EnterTransPointRegionNotify( emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify.class, emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify.Builder.class); } - public static final int POINT_ID_FIELD_NUMBER = 5; - private int pointId_; + public static final int SCENE_ID_FIELD_NUMBER = 5; + private int sceneId_; /** - * uint32 point_id = 5; - * @return The pointId. + * uint32 scene_id = 5; + * @return The sceneId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getSceneId() { + return sceneId_; } - public static final int SCENE_ID_FIELD_NUMBER = 12; - private int sceneId_; + public static final int POINT_ID_FIELD_NUMBER = 8; + private int pointId_; /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 point_id = 8; + * @return The pointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointId() { + return pointId_; } private byte memoizedIsInitialized = -1; @@ -158,11 +159,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (pointId_ != 0) { - output.writeUInt32(5, pointId_); - } if (sceneId_ != 0) { - output.writeUInt32(12, sceneId_); + output.writeUInt32(5, sceneId_); + } + if (pointId_ != 0) { + output.writeUInt32(8, pointId_); } unknownFields.writeTo(output); } @@ -173,13 +174,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (pointId_ != 0) { + if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, pointId_); + .computeUInt32Size(5, sceneId_); } - if (sceneId_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, sceneId_); + .computeUInt32Size(8, pointId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +197,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify other = (emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify) obj; - if (getPointId() - != other.getPointId()) return false; if (getSceneId() != other.getSceneId()) return false; + if (getPointId() + != other.getPointId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +212,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + POINT_ID_FIELD_NUMBER; - hash = (53 * hash) + getPointId(); hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); + hash = (37 * hash) + POINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getPointId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +313,9 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 22064
-     * Obf: ECDCICGGBDA
+     * CmdId: 9692
+     * obf: PDEMNLNIIOM
+     * 5.0
      *
* * Protobuf type {@code EnterTransPointRegionNotify} @@ -353,10 +355,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pointId_ = 0; - sceneId_ = 0; + pointId_ = 0; + return this; } @@ -383,8 +385,8 @@ public emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTran @java.lang.Override public emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify buildPartial() { emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify result = new emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify(this); - result.pointId_ = pointId_; result.sceneId_ = sceneId_; + result.pointId_ = pointId_; onBuilt(); return result; } @@ -433,12 +435,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify other) { if (other == emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTransPointRegionNotify.getDefaultInstance()) return this; - if (other.getPointId() != 0) { - setPointId(other.getPointId()); - } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } + if (other.getPointId() != 0) { + setPointId(other.getPointId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +470,64 @@ public Builder mergeFrom( return this; } - private int pointId_ ; + private int sceneId_ ; /** - * uint32 point_id = 5; - * @return The pointId. + * uint32 scene_id = 5; + * @return The sceneId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 point_id = 5; - * @param value The pointId to set. + * uint32 scene_id = 5; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setPointId(int value) { + public Builder setSceneId(int value) { - pointId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 point_id = 5; + * uint32 scene_id = 5; * @return This builder for chaining. */ - public Builder clearPointId() { + public Builder clearSceneId() { - pointId_ = 0; + sceneId_ = 0; onChanged(); return this; } - private int sceneId_ ; + private int pointId_ ; /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 point_id = 8; + * @return The pointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointId() { + return pointId_; } /** - * uint32 scene_id = 12; - * @param value The sceneId to set. + * uint32 point_id = 8; + * @param value The pointId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setPointId(int value) { - sceneId_ = value; + pointId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 12; + * uint32 point_id = 8; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearPointId() { - sceneId_ = 0; + pointId_ = 0; onChanged(); return this; } @@ -597,8 +599,8 @@ public emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTran static { java.lang.String[] descriptorData = { "\n!EnterTransPointRegionNotify.proto\"A\n\033E" + - "nterTransPointRegionNotify\022\020\n\010point_id\030\005" + - " \001(\r\022\020\n\010scene_id\030\014 \001(\rB\033\n\031emu.grasscutte" + + "nterTransPointRegionNotify\022\020\n\010scene_id\030\005" + + " \001(\r\022\020\n\010point_id\030\010 \001(\rB\033\n\031emu.grasscutte" + "r.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +612,7 @@ public emu.grasscutter.net.proto.EnterTransPointRegionNotifyOuterClass.EnterTran internal_static_EnterTransPointRegionNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_EnterTransPointRegionNotify_descriptor, - new java.lang.String[] { "PointId", "SceneId", }); + new java.lang.String[] { "SceneId", "PointId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterTrialAvatarActivityDungeonRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterTrialAvatarActivityDungeonRspOuterClass.java index 607140eeb55..8c7f5d2e166 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EnterTrialAvatarActivityDungeonRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterTrialAvatarActivityDungeonRspOuterClass.java @@ -19,27 +19,26 @@ public interface EnterTrialAvatarActivityDungeonRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 activity_id = 1; - * @return The activityId. + * uint32 trial_avatar_index_id = 4; + * @return The trialAvatarIndexId. */ - int getActivityId(); + int getTrialAvatarIndexId(); /** - * int32 retcode = 15; + * int32 retcode = 12; * @return The retcode. */ int getRetcode(); /** - * uint32 trial_avatar_index_id = 6; - * @return The trialAvatarIndexId. + * uint32 activity_id = 14; + * @return The activityId. */ - int getTrialAvatarIndexId(); + int getActivityId(); } /** * 
-   * CmdId: 8751
-   * Obf: IKPHDDJIDGO
+   * CmdId: 244
    *
* * Protobuf type {@code EnterTrialAvatarActivityDungeonRsp} @@ -86,19 +85,19 @@ private EnterTrialAvatarActivityDungeonRsp( case 0: done = true; break; - case 8: { + case 32: { - activityId_ = input.readUInt32(); + trialAvatarIndexId_ = input.readUInt32(); break; } - case 48: { + case 96: { - trialAvatarIndexId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 120: { + case 112: { - retcode_ = input.readInt32(); + activityId_ = input.readUInt32(); break; } default: { @@ -133,21 +132,21 @@ private EnterTrialAvatarActivityDungeonRsp( emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp.class, emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp.Builder.class); } - public static final int ACTIVITY_ID_FIELD_NUMBER = 1; - private int activityId_; + public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 4; + private int trialAvatarIndexId_; /** - * uint32 activity_id = 1; - * @return The activityId. + * uint32 trial_avatar_index_id = 4; + * @return The trialAvatarIndexId. */ @java.lang.Override - public int getActivityId() { - return activityId_; + public int getTrialAvatarIndexId() { + return trialAvatarIndexId_; } - public static final int RETCODE_FIELD_NUMBER = 15; + public static final int RETCODE_FIELD_NUMBER = 12; private int retcode_; /** - * int32 retcode = 15; + * int32 retcode = 12; * @return The retcode. */ @java.lang.Override @@ -155,15 +154,15 @@ public int getRetcode() { return retcode_; } - public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 6; - private int trialAvatarIndexId_; + public static final int ACTIVITY_ID_FIELD_NUMBER = 14; + private int activityId_; /** - * uint32 trial_avatar_index_id = 6; - * @return The trialAvatarIndexId. + * uint32 activity_id = 14; + * @return The activityId. */ @java.lang.Override - public int getTrialAvatarIndexId() { - return trialAvatarIndexId_; + public int getActivityId() { + return activityId_; } private byte memoizedIsInitialized = -1; @@ -180,14 +179,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (activityId_ != 0) { - output.writeUInt32(1, activityId_); - } if (trialAvatarIndexId_ != 0) { - output.writeUInt32(6, trialAvatarIndexId_); + output.writeUInt32(4, trialAvatarIndexId_); } if (retcode_ != 0) { - output.writeInt32(15, retcode_); + output.writeInt32(12, retcode_); + } + if (activityId_ != 0) { + output.writeUInt32(14, activityId_); } unknownFields.writeTo(output); } @@ -198,17 +197,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (activityId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, activityId_); - } if (trialAvatarIndexId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, trialAvatarIndexId_); + .computeUInt32Size(4, trialAvatarIndexId_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(15, retcode_); + .computeInt32Size(12, retcode_); + } + if (activityId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(14, activityId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +224,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp other = (emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp) obj; - if (getActivityId() - != other.getActivityId()) return false; - if (getRetcode() - != other.getRetcode()) return false; if (getTrialAvatarIndexId() != other.getTrialAvatarIndexId()) return false; + if (getRetcode() + != other.getRetcode()) return false; + if (getActivityId() + != other.getActivityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +241,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getActivityId(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER; hash = (53 * hash) + getTrialAvatarIndexId(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getActivityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +344,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 8751
-     * Obf: IKPHDDJIDGO
+     * CmdId: 244
      *
* * Protobuf type {@code EnterTrialAvatarActivityDungeonRsp} @@ -386,11 +384,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - activityId_ = 0; + trialAvatarIndexId_ = 0; retcode_ = 0; - trialAvatarIndexId_ = 0; + activityId_ = 0; return this; } @@ -418,9 +416,9 @@ public emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.En @java.lang.Override public emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp buildPartial() { emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp result = new emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp(this); - result.activityId_ = activityId_; - result.retcode_ = retcode_; result.trialAvatarIndexId_ = trialAvatarIndexId_; + result.retcode_ = retcode_; + result.activityId_ = activityId_; onBuilt(); return result; } @@ -469,14 +467,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp other) { if (other == emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.EnterTrialAvatarActivityDungeonRsp.getDefaultInstance()) return this; - if (other.getActivityId() != 0) { - setActivityId(other.getActivityId()); + if (other.getTrialAvatarIndexId() != 0) { + setTrialAvatarIndexId(other.getTrialAvatarIndexId()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (other.getTrialAvatarIndexId() != 0) { - setTrialAvatarIndexId(other.getTrialAvatarIndexId()); + if (other.getActivityId() != 0) { + setActivityId(other.getActivityId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -507,40 +505,40 @@ public Builder mergeFrom( return this; } - private int activityId_ ; + private int trialAvatarIndexId_ ; /** - * uint32 activity_id = 1; - * @return The activityId. + * uint32 trial_avatar_index_id = 4; + * @return The trialAvatarIndexId. */ @java.lang.Override - public int getActivityId() { - return activityId_; + public int getTrialAvatarIndexId() { + return trialAvatarIndexId_; } /** - * uint32 activity_id = 1; - * @param value The activityId to set. + * uint32 trial_avatar_index_id = 4; + * @param value The trialAvatarIndexId to set. * @return This builder for chaining. */ - public Builder setActivityId(int value) { + public Builder setTrialAvatarIndexId(int value) { - activityId_ = value; + trialAvatarIndexId_ = value; onChanged(); return this; } /** - * uint32 activity_id = 1; + * uint32 trial_avatar_index_id = 4; * @return This builder for chaining. */ - public Builder clearActivityId() { + public Builder clearTrialAvatarIndexId() { - activityId_ = 0; + trialAvatarIndexId_ = 0; onChanged(); return this; } private int retcode_ ; /** - * int32 retcode = 15; + * int32 retcode = 12; * @return The retcode. */ @java.lang.Override @@ -548,7 +546,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 15; + * int32 retcode = 12; * @param value The retcode to set. * @return This builder for chaining. */ @@ -559,7 +557,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 15; + * int32 retcode = 12; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -569,33 +567,33 @@ public Builder clearRetcode() { return this; } - private int trialAvatarIndexId_ ; + private int activityId_ ; /** - * uint32 trial_avatar_index_id = 6; - * @return The trialAvatarIndexId. + * uint32 activity_id = 14; + * @return The activityId. */ @java.lang.Override - public int getTrialAvatarIndexId() { - return trialAvatarIndexId_; + public int getActivityId() { + return activityId_; } /** - * uint32 trial_avatar_index_id = 6; - * @param value The trialAvatarIndexId to set. + * uint32 activity_id = 14; + * @param value The activityId to set. * @return This builder for chaining. */ - public Builder setTrialAvatarIndexId(int value) { + public Builder setActivityId(int value) { - trialAvatarIndexId_ = value; + activityId_ = value; onChanged(); return this; } /** - * uint32 trial_avatar_index_id = 6; + * uint32 activity_id = 14; * @return This builder for chaining. */ - public Builder clearTrialAvatarIndexId() { + public Builder clearActivityId() { - trialAvatarIndexId_ = 0; + activityId_ = 0; onChanged(); return this; } @@ -668,8 +666,8 @@ public emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.En java.lang.String[] descriptorData = { "\n(EnterTrialAvatarActivityDungeonRsp.pro" + "to\"i\n\"EnterTrialAvatarActivityDungeonRsp" + - "\022\023\n\013activity_id\030\001 \001(\r\022\017\n\007retcode\030\017 \001(\005\022\035" + - "\n\025trial_avatar_index_id\030\006 \001(\rB\033\n\031emu.gra" + + "\022\035\n\025trial_avatar_index_id\030\004 \001(\r\022\017\n\007retco" + + "de\030\014 \001(\005\022\023\n\013activity_id\030\016 \001(\rB\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +679,7 @@ public emu.grasscutter.net.proto.EnterTrialAvatarActivityDungeonRspOuterClass.En internal_static_EnterTrialAvatarActivityDungeonRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_EnterTrialAvatarActivityDungeonRsp_descriptor, - new java.lang.String[] { "ActivityId", "Retcode", "TrialAvatarIndexId", }); + new java.lang.String[] { "TrialAvatarIndexId", "Retcode", "ActivityId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityAbilityInvokeEntryOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityAbilityInvokeEntryOuterClass.java index 4b65ecd57be..e198f428d4b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EntityAbilityInvokeEntryOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityAbilityInvokeEntryOuterClass.java @@ -19,38 +19,38 @@ public interface EntityAbilityInvokeEntryOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .AbilityInvokeEntry invokes = 2; + * uint32 entity_id = 2; + * @return The entityId. + */ + int getEntityId(); + + /** + * repeated .AbilityInvokeEntry invokes = 3; */ java.util.List getInvokesList(); /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index); /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ int getInvokesCount(); /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ java.util.List getInvokesOrBuilderList(); /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder( int index); - - /** - * uint32 entity_id = 3; - * @return The entityId. - */ - int getEntityId(); } /** * 
-   * Obf: GMHAEILNEPA
+   * obf: KKHGLCJOCEK
    *
* * Protobuf type {@code EntityAbilityInvokeEntry} @@ -99,7 +99,12 @@ private EntityAbilityInvokeEntry( case 0: done = true; break; - case 18: { + case 16: { + + entityId_ = input.readUInt32(); + break; + } + case 26: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { invokes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -108,11 +113,6 @@ private EntityAbilityInvokeEntry( input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.parser(), extensionRegistry)); break; } - case 24: { - - entityId_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -148,17 +148,28 @@ private EntityAbilityInvokeEntry( emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.class, emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.Builder.class); } - public static final int INVOKES_FIELD_NUMBER = 2; + public static final int ENTITY_ID_FIELD_NUMBER = 2; + private int entityId_; + /** + * uint32 entity_id = 2; + * @return The entityId. + */ + @java.lang.Override + public int getEntityId() { + return entityId_; + } + + public static final int INVOKES_FIELD_NUMBER = 3; private java.util.List invokes_; /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ @java.lang.Override public java.util.List getInvokesList() { return invokes_; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ @java.lang.Override public java.util.List @@ -166,21 +177,21 @@ public java.util.Listrepeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ @java.lang.Override public int getInvokesCount() { return invokes_.size(); } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) { return invokes_.get(index); } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder( @@ -188,17 +199,6 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry return invokes_.get(index); } - public static final int ENTITY_ID_FIELD_NUMBER = 3; - private int entityId_; - /** - * uint32 entity_id = 3; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -213,11 +213,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < invokes_.size(); i++) { - output.writeMessage(2, invokes_.get(i)); - } if (entityId_ != 0) { - output.writeUInt32(3, entityId_); + output.writeUInt32(2, entityId_); + } + for (int i = 0; i < invokes_.size(); i++) { + output.writeMessage(3, invokes_.get(i)); } unknownFields.writeTo(output); } @@ -228,13 +228,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < invokes_.size(); i++) { + if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, invokes_.get(i)); + .computeUInt32Size(2, entityId_); } - if (entityId_ != 0) { + for (int i = 0; i < invokes_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, entityId_); + .computeMessageSize(3, invokes_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -251,10 +251,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry other = (emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry) obj; - if (!getInvokesList() - .equals(other.getInvokesList())) return false; if (getEntityId() != other.getEntityId()) return false; + if (!getInvokesList() + .equals(other.getInvokesList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -266,12 +266,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); if (getInvokesCount() > 0) { hash = (37 * hash) + INVOKES_FIELD_NUMBER; hash = (53 * hash) + getInvokesList().hashCode(); } - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -369,7 +369,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: GMHAEILNEPA
+     * obf: KKHGLCJOCEK
      *
* * Protobuf type {@code EntityAbilityInvokeEntry} @@ -410,14 +410,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + entityId_ = 0; + if (invokesBuilder_ == null) { invokes_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { invokesBuilder_.clear(); } - entityId_ = 0; - return this; } @@ -445,6 +445,7 @@ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilit public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry buildPartial() { emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry result = new emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry(this); int from_bitField0_ = bitField0_; + result.entityId_ = entityId_; if (invokesBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { invokes_ = java.util.Collections.unmodifiableList(invokes_); @@ -454,7 +455,6 @@ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilit } else { result.invokes_ = invokesBuilder_.build(); } - result.entityId_ = entityId_; onBuilt(); return result; } @@ -503,6 +503,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry other) { if (other == emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilityInvokeEntry.getDefaultInstance()) return this; + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); + } if (invokesBuilder_ == null) { if (!other.invokes_.isEmpty()) { if (invokes_.isEmpty()) { @@ -529,9 +532,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuter } } } - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -562,6 +562,37 @@ public Builder mergeFrom( } private int bitField0_; + private int entityId_ ; + /** + * uint32 entity_id = 2; + * @return The entityId. + */ + @java.lang.Override + public int getEntityId() { + return entityId_; + } + /** + * uint32 entity_id = 2; + * @param value The entityId to set. + * @return This builder for chaining. + */ + public Builder setEntityId(int value) { + + entityId_ = value; + onChanged(); + return this; + } + /** + * uint32 entity_id = 2; + * @return This builder for chaining. + */ + public Builder clearEntityId() { + + entityId_ = 0; + onChanged(); + return this; + } + private java.util.List invokes_ = java.util.Collections.emptyList(); private void ensureInvokesIsMutable() { @@ -575,7 +606,7 @@ private void ensureInvokesIsMutable() { emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_; /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public java.util.List getInvokesList() { if (invokesBuilder_ == null) { @@ -585,7 +616,7 @@ public java.util.Listrepeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public int getInvokesCount() { if (invokesBuilder_ == null) { @@ -595,7 +626,7 @@ public int getInvokesCount() { } } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) { if (invokesBuilder_ == null) { @@ -605,7 +636,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry } } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder setInvokes( int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) { @@ -622,7 +653,7 @@ public Builder setInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder setInvokes( int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) { @@ -636,7 +667,7 @@ public Builder setInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) { if (invokesBuilder_ == null) { @@ -652,7 +683,7 @@ public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder addInvokes( int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) { @@ -669,7 +700,7 @@ public Builder addInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder addInvokes( emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) { @@ -683,7 +714,7 @@ public Builder addInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder addInvokes( int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) { @@ -697,7 +728,7 @@ public Builder addInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder addAllInvokes( java.lang.Iterable values) { @@ -712,7 +743,7 @@ public Builder addAllInvokes( return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder clearInvokes() { if (invokesBuilder_ == null) { @@ -725,7 +756,7 @@ public Builder clearInvokes() { return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public Builder removeInvokes(int index) { if (invokesBuilder_ == null) { @@ -738,14 +769,14 @@ public Builder removeInvokes(int index) { return this; } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder( int index) { return getInvokesFieldBuilder().getBuilder(index); } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder( int index) { @@ -755,7 +786,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry } } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public java.util.List getInvokesOrBuilderList() { @@ -766,14 +797,14 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry } } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() { return getInvokesFieldBuilder().addBuilder( emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance()); } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder( int index) { @@ -781,7 +812,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance()); } /** - * repeated .AbilityInvokeEntry invokes = 2; + * repeated .AbilityInvokeEntry invokes = 3; */ public java.util.List getInvokesBuilderList() { @@ -801,37 +832,6 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry } return invokesBuilder_; } - - private int entityId_ ; - /** - * uint32 entity_id = 3; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - /** - * uint32 entity_id = 3; - * @param value The entityId to set. - * @return This builder for chaining. - */ - public Builder setEntityId(int value) { - - entityId_ = value; - onChanged(); - return this; - } - /** - * uint32 entity_id = 3; - * @return This builder for chaining. - */ - public Builder clearEntityId() { - - entityId_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -901,8 +901,8 @@ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilit java.lang.String[] descriptorData = { "\n\036EntityAbilityInvokeEntry.proto\032\030Abilit" + "yInvokeEntry.proto\"S\n\030EntityAbilityInvok" + - "eEntry\022$\n\007invokes\030\002 \003(\0132\023.AbilityInvokeE" + - "ntry\022\021\n\tentity_id\030\003 \001(\rB\033\n\031emu.grasscutt" + + "eEntry\022\021\n\tentity_id\030\002 \001(\r\022$\n\007invokes\030\003 \003" + + "(\0132\023.AbilityInvokeEntryB\033\n\031emu.grasscutt" + "er.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -915,7 +915,7 @@ public emu.grasscutter.net.proto.EntityAbilityInvokeEntryOuterClass.EntityAbilit internal_static_EntityAbilityInvokeEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_EntityAbilityInvokeEntry_descriptor, - new java.lang.String[] { "Invokes", "EntityId", }); + new java.lang.String[] { "EntityId", "Invokes", }); emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityAiSyncNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityAiSyncNotifyOuterClass.java index 19b6335b06a..70f811c51c1 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EntityAiSyncNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityAiSyncNotifyOuterClass.java @@ -36,33 +36,33 @@ public interface EntityAiSyncNotifyOrBuilder extends int getLocalAvatarAlertedMonsterList(int index); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ java.util.List getInfoListList(); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getInfoList(int index); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ int getInfoListCount(); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ java.util.List getInfoListOrBuilderList(); /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInfoListOrBuilder( int index); } /** * 
-   * CmdId: 5447
-   * Obf: HKGLOBEAHIN
+   * CmdId: 23720
+   * Obf: PPCFAKHEBJF
    *
* * Protobuf type {@code EntityAiSyncNotify} @@ -133,7 +133,7 @@ private EntityAiSyncNotify( input.popLimit(limit); break; } - case 42: { + case 106: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { infoList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -208,17 +208,17 @@ public int getLocalAvatarAlertedMonsterList(int index) { } private int localAvatarAlertedMonsterListMemoizedSerializedSize = -1; - public static final int INFO_LIST_FIELD_NUMBER = 5; + public static final int INFO_LIST_FIELD_NUMBER = 13; private java.util.List infoList_; /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ @java.lang.Override public java.util.List getInfoListList() { return infoList_; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ @java.lang.Override public java.util.List @@ -226,21 +226,21 @@ public java.util.List return infoList_; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ @java.lang.Override public int getInfoListCount() { return infoList_.size(); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ @java.lang.Override public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getInfoList(int index) { return infoList_.get(index); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ @java.lang.Override public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInfoListOrBuilder( @@ -271,7 +271,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeUInt32NoTag(localAvatarAlertedMonsterList_.getInt(i)); } for (int i = 0; i < infoList_.size(); i++) { - output.writeMessage(5, infoList_.get(i)); + output.writeMessage(13, infoList_.get(i)); } unknownFields.writeTo(output); } @@ -298,7 +298,7 @@ public int getSerializedSize() { } for (int i = 0; i < infoList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, infoList_.get(i)); + .computeMessageSize(13, infoList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -435,8 +435,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5447
-     * Obf: HKGLOBEAHIN
+     * CmdId: 23720
+     * Obf: PPCFAKHEBJF
      *
* * Protobuf type {@code EntityAiSyncNotify} @@ -732,7 +732,7 @@ private void ensureInfoListIsMutable() { emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder> infoListBuilder_; /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public java.util.List getInfoListList() { if (infoListBuilder_ == null) { @@ -742,7 +742,7 @@ public java.util.List } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public int getInfoListCount() { if (infoListBuilder_ == null) { @@ -752,7 +752,7 @@ public int getInfoListCount() { } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getInfoList(int index) { if (infoListBuilder_ == null) { @@ -762,7 +762,7 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo getInfoList(int } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder setInfoList( int index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo value) { @@ -779,7 +779,7 @@ public Builder setInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder setInfoList( int index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder builderForValue) { @@ -793,7 +793,7 @@ public Builder setInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder addInfoList(emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo value) { if (infoListBuilder_ == null) { @@ -809,7 +809,7 @@ public Builder addInfoList(emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSync return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder addInfoList( int index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo value) { @@ -826,7 +826,7 @@ public Builder addInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder addInfoList( emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder builderForValue) { @@ -840,7 +840,7 @@ public Builder addInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder addInfoList( int index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder builderForValue) { @@ -854,7 +854,7 @@ public Builder addInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder addAllInfoList( java.lang.Iterable values) { @@ -869,7 +869,7 @@ public Builder addAllInfoList( return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder clearInfoList() { if (infoListBuilder_ == null) { @@ -882,7 +882,7 @@ public Builder clearInfoList() { return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public Builder removeInfoList(int index) { if (infoListBuilder_ == null) { @@ -895,14 +895,14 @@ public Builder removeInfoList(int index) { return this; } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder getInfoListBuilder( int index) { return getInfoListFieldBuilder().getBuilder(index); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInfoListOrBuilder( int index) { @@ -912,7 +912,7 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInf } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public java.util.List getInfoListOrBuilderList() { @@ -923,14 +923,14 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfoOrBuilder getInf } } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder addInfoListBuilder() { return getInfoListFieldBuilder().addBuilder( emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.getDefaultInstance()); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder addInfoListBuilder( int index) { @@ -938,7 +938,7 @@ public emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.Builder addInfo index, emu.grasscutter.net.proto.AiSyncInfoOuterClass.AiSyncInfo.getDefaultInstance()); } /** - * repeated .AiSyncInfo info_list = 5; + * repeated .AiSyncInfo info_list = 13; */ public java.util.List getInfoListBuilderList() { @@ -1028,7 +1028,7 @@ public emu.grasscutter.net.proto.EntityAiSyncNotifyOuterClass.EntityAiSyncNotify "\n\030EntityAiSyncNotify.proto\032\020AiSyncInfo.p" + "roto\"_\n\022EntityAiSyncNotify\022)\n!local_avat" + "ar_alerted_monster_list\030\004 \003(\r\022\036\n\tinfo_li" + - "st\030\005 \003(\0132\013.AiSyncInfoB\033\n\031emu.grasscutter" + + "st\030\r \003(\0132\013.AiSyncInfoB\033\n\031emu.grasscutter" + ".net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java index c2de662db6b..b22f03e1cb8 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java @@ -450,7 +450,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (nNFONEOHGHE_ != 0F) { output.writeFloat(12, nNFONEOHGHE_); } - if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_REASON_NONE.getNumber()) { + if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_NONE.getNumber()) { output.writeEnum(13, changeHpReason_); } if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) { @@ -503,7 +503,7 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeFloatSize(12, nNFONEOHGHE_); } - if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_REASON_NONE.getNumber()) { + if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_NONE.getNumber()) { size += com.google.protobuf.CodedOutputStream .computeEnumSize(13, changeHpReason_); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAiSyncCombatThreatInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAiSyncCombatThreatInfoNotifyOuterClass.java index 37fa3c094d1..409e436375f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAiSyncCombatThreatInfoNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAiSyncCombatThreatInfoNotifyOuterClass.java @@ -19,11 +19,11 @@ public interface EvtAiSyncCombatThreatInfoNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ int getCombatThreatInfoMapCount(); /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ boolean containsCombatThreatInfoMap( int key); @@ -34,19 +34,19 @@ boolean containsCombatThreatInfoMap( java.util.Map getCombatThreatInfoMap(); /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ java.util.Map getCombatThreatInfoMapMap(); /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo getCombatThreatInfoMapOrDefault( int key, emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo defaultValue); /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo getCombatThreatInfoMapOrThrow( @@ -54,8 +54,8 @@ emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo getCombatThreatInf } /** * 
-   * CmdId: 7714
-   * Obf: HHOBKODCGBH
+   * CmdId: 1442
+   * 5.0
    *
* * Protobuf type {@code EvtAiSyncCombatThreatInfoNotify} @@ -103,7 +103,7 @@ private EvtAiSyncCombatThreatInfoNotify( case 0: done = true; break; - case 122: { + case 90: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { combatThreatInfoMap_ = com.google.protobuf.MapField.newMapField( CombatThreatInfoMapDefaultEntryHolder.defaultEntry); @@ -145,7 +145,7 @@ private EvtAiSyncCombatThreatInfoNotify( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 15: + case 11: return internalGetCombatThreatInfoMap(); default: throw new RuntimeException( @@ -160,7 +160,7 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.EvtAiSyncCombatThreatInfoNotifyOuterClass.EvtAiSyncCombatThreatInfoNotify.class, emu.grasscutter.net.proto.EvtAiSyncCombatThreatInfoNotifyOuterClass.EvtAiSyncCombatThreatInfoNotify.Builder.class); } - public static final int COMBAT_THREAT_INFO_MAP_FIELD_NUMBER = 15; + public static final int COMBAT_THREAT_INFO_MAP_FIELD_NUMBER = 11; private static final class CombatThreatInfoMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo> defaultEntry = @@ -187,7 +187,7 @@ public int getCombatThreatInfoMapCount() { return internalGetCombatThreatInfoMap().getMap().size(); } /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ @java.lang.Override @@ -205,7 +205,7 @@ public java.util.Mapmap<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ @java.lang.Override @@ -213,7 +213,7 @@ public java.util.Mapmap<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ @java.lang.Override @@ -226,7 +226,7 @@ public emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo getCombatTh return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ @java.lang.Override @@ -260,7 +260,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output, internalGetCombatThreatInfoMap(), CombatThreatInfoMapDefaultEntryHolder.defaultEntry, - 15); + 11); unknownFields.writeTo(output); } @@ -278,7 +278,7 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, combatThreatInfoMap__); + .computeMessageSize(11, combatThreatInfoMap__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -409,8 +409,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7714
-     * Obf: HHOBKODCGBH
+     * CmdId: 1442
+     * 5.0
      *
* * Protobuf type {@code EvtAiSyncCombatThreatInfoNotify} @@ -428,7 +428,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 15: + case 11: return internalGetCombatThreatInfoMap(); default: throw new RuntimeException( @@ -439,7 +439,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 15: + case 11: return internalGetMutableCombatThreatInfoMap(); default: throw new RuntimeException( @@ -609,7 +609,7 @@ public int getCombatThreatInfoMapCount() { return internalGetCombatThreatInfoMap().getMap().size(); } /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ @java.lang.Override @@ -627,7 +627,7 @@ public java.util.Mapmap<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ @java.lang.Override @@ -635,7 +635,7 @@ public java.util.Mapmap<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ @java.lang.Override @@ -648,7 +648,7 @@ public emu.grasscutter.net.proto.AiThreatInfoOuterClass.AiThreatInfo getCombatTh return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ @java.lang.Override @@ -669,7 +669,7 @@ public Builder clearCombatThreatInfoMap() { return this; } /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ public Builder removeCombatThreatInfoMap( @@ -688,7 +688,7 @@ public Builder removeCombatThreatInfoMap( return internalGetMutableCombatThreatInfoMap().getMutableMap(); } /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ public Builder putCombatThreatInfoMap( int key, @@ -700,7 +700,7 @@ public Builder putCombatThreatInfoMap( return this; } /** - * map<uint32, .AiThreatInfo> combat_threat_info_map = 15; + * map<uint32, .AiThreatInfo> combat_threat_info_map = 11; */ public Builder putAllCombatThreatInfoMap( @@ -784,7 +784,7 @@ public emu.grasscutter.net.proto.EvtAiSyncCombatThreatInfoNotifyOuterClass.EvtAi "\n%EvtAiSyncCombatThreatInfoNotify.proto\032" + "\022AiThreatInfo.proto\"\307\001\n\037EvtAiSyncCombatT" + "hreatInfoNotify\022Y\n\026combat_threat_info_ma" + - "p\030\017 \003(\01329.EvtAiSyncCombatThreatInfoNotif" + + "p\030\013 \003(\01329.EvtAiSyncCombatThreatInfoNotif" + "y.CombatThreatInfoMapEntry\032I\n\030CombatThre" + "atInfoMapEntry\022\013\n\003key\030\001 \001(\r\022\034\n\005value\030\002 \001" + "(\0132\r.AiThreatInfo:\0028\001B\033\n\031emu.grasscutter" + diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarEnterFocusNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarEnterFocusNotifyOuterClass.java index 33d3629e0cc..f31bbc9855b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarEnterFocusNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarEnterFocusNotifyOuterClass.java @@ -19,101 +19,101 @@ public interface EvtAvatarEnterFocusNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector focus_forward = 13; + * bool FIJOOLAANGJ = 1; + * @return The fIJOOLAANGJ. + */ + boolean getFIJOOLAANGJ(); + + /** + * bool FLNEMNNKMEB = 2; + * @return The fLNEMNNKMEB. + */ + boolean getFLNEMNNKMEB(); + + /** + * .Vector focus_forward = 4; * @return Whether the focusForward field is set. */ boolean hasFocusForward(); /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; * @return The focusForward. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getFocusForward(); /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwardOrBuilder(); /** - * .ForwardType forward_type = 3; + * bool KKEBECBGPLN = 5; + * @return The kKEBECBGPLN. + */ + boolean getKKEBECBGPLN(); + + /** + * .ForwardType forward_type = 6; * @return The enum numeric value on the wire for forwardType. */ int getForwardTypeValue(); /** - * .ForwardType forward_type = 3; + * .ForwardType forward_type = 6; * @return The forwardType. */ emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType(); /** - * bool CCKKABKJJGP = 12; - * @return The cCKKABKJJGP. - */ - boolean getCCKKABKJJGP(); - - /** - * bool MDMOIMDCOPF = 7; - * @return The mDMOIMDCOPF. - */ - boolean getMDMOIMDCOPF(); - - /** - * uint32 entity_id = 11; - * @return The entityId. - */ - int getEntityId(); - - /** - * bool MCNECDNCLCJ = 1; - * @return The mCNECDNCLCJ. + * bool BNNBNPPFBGF = 7; + * @return The bNNBNPPFBGF. */ - boolean getMCNECDNCLCJ(); + boolean getBNNBNPPFBGF(); /** - * bool GMLEBIHPOKD = 5; - * @return The gMLEBIHPOKD. + * bool IEOMMIKNNIE = 8; + * @return The iEOMMIKNNIE. */ - boolean getGMLEBIHPOKD(); + boolean getIEOMMIKNNIE(); /** - * bool OGOLKMLFFHE = 2; - * @return The oGOLKMLFFHE. + * bool DMIMBNDEIJO = 9; + * @return The dMIMBNDEIJO. */ - boolean getOGOLKMLFFHE(); + boolean getDMIMBNDEIJO(); /** - * bool OEMKCENFMIM = 10; - * @return The oEMKCENFMIM. + * bool DDPOAJHDNAI = 10; + * @return The dDPOAJHDNAI. */ - boolean getOEMKCENFMIM(); + boolean getDDPOAJHDNAI(); /** - * bool DBPHFOKBNCP = 9; - * @return The dBPHFOKBNCP. + * bool AKOKCLCPKEI = 11; + * @return The aKOKCLCPKEI. */ - boolean getDBPHFOKBNCP(); + boolean getAKOKCLCPKEI(); /** - * bool PBHFFGHHPMA = 15; - * @return The pBHFFGHHPMA. + * bool NNBLLLGBGKG = 12; + * @return The nNBLLLGBGKG. */ - boolean getPBHFFGHHPMA(); + boolean getNNBLLLGBGKG(); /** - * bool EGBLCMOLOMC = 8; - * @return The eGBLCMOLOMC. + * uint32 entity_id = 14; + * @return The entityId. */ - boolean getEGBLCMOLOMC(); + int getEntityId(); /** - * bool NACMCGNGDLN = 6; - * @return The nACMCGNGDLN. + * bool EKMGPOIMAIL = 15; + * @return The eKMGPOIMAIL. */ - boolean getNACMCGNGDLN(); + boolean getEKMGPOIMAIL(); } /** * 
-   * CmdId: 20643
-   * Obf: CMOGIHEMPNF
+   * CmdId: 29042
+   * obf: FGEMHAFCPPI
    *
* * Protobuf type {@code EvtAvatarEnterFocusNotify} @@ -163,76 +163,76 @@ private EvtAvatarEnterFocusNotify( break; case 8: { - mCNECDNCLCJ_ = input.readBool(); + fIJOOLAANGJ_ = input.readBool(); break; } case 16: { - oGOLKMLFFHE_ = input.readBool(); + fLNEMNNKMEB_ = input.readBool(); break; } - case 24: { - int rawValue = input.readEnum(); + case 34: { + emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; + if (focusForward_ != null) { + subBuilder = focusForward_.toBuilder(); + } + focusForward_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(focusForward_); + focusForward_ = subBuilder.buildPartial(); + } - forwardType_ = rawValue; break; } case 40: { - gMLEBIHPOKD_ = input.readBool(); + kKEBECBGPLN_ = input.readBool(); break; } case 48: { + int rawValue = input.readEnum(); - nACMCGNGDLN_ = input.readBool(); + forwardType_ = rawValue; break; } case 56: { - mDMOIMDCOPF_ = input.readBool(); + bNNBNPPFBGF_ = input.readBool(); break; } case 64: { - eGBLCMOLOMC_ = input.readBool(); + iEOMMIKNNIE_ = input.readBool(); break; } case 72: { - dBPHFOKBNCP_ = input.readBool(); + dMIMBNDEIJO_ = input.readBool(); break; } case 80: { - oEMKCENFMIM_ = input.readBool(); + dDPOAJHDNAI_ = input.readBool(); break; } case 88: { - entityId_ = input.readUInt32(); + aKOKCLCPKEI_ = input.readBool(); break; } case 96: { - cCKKABKJJGP_ = input.readBool(); + nNBLLLGBGKG_ = input.readBool(); break; } - case 106: { - emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; - if (focusForward_ != null) { - subBuilder = focusForward_.toBuilder(); - } - focusForward_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(focusForward_); - focusForward_ = subBuilder.buildPartial(); - } + case 112: { + entityId_ = input.readUInt32(); break; } case 120: { - pBHFFGHHPMA_ = input.readBool(); + eKMGPOIMAIL_ = input.readBool(); break; } default: { @@ -267,10 +267,32 @@ private EvtAvatarEnterFocusNotify( emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify.class, emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify.Builder.class); } - public static final int FOCUS_FORWARD_FIELD_NUMBER = 13; + public static final int FIJOOLAANGJ_FIELD_NUMBER = 1; + private boolean fIJOOLAANGJ_; + /** + * bool FIJOOLAANGJ = 1; + * @return The fIJOOLAANGJ. + */ + @java.lang.Override + public boolean getFIJOOLAANGJ() { + return fIJOOLAANGJ_; + } + + public static final int FLNEMNNKMEB_FIELD_NUMBER = 2; + private boolean fLNEMNNKMEB_; + /** + * bool FLNEMNNKMEB = 2; + * @return The fLNEMNNKMEB. + */ + @java.lang.Override + public boolean getFLNEMNNKMEB() { + return fLNEMNNKMEB_; + } + + public static final int FOCUS_FORWARD_FIELD_NUMBER = 4; private emu.grasscutter.net.proto.VectorOuterClass.Vector focusForward_; /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; * @return Whether the focusForward field is set. */ @java.lang.Override @@ -278,7 +300,7 @@ public boolean hasFocusForward() { return focusForward_ != null; } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; * @return The focusForward. */ @java.lang.Override @@ -286,24 +308,35 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getFocusForward() { return focusForward_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : focusForward_; } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwardOrBuilder() { return getFocusForward(); } - public static final int FORWARD_TYPE_FIELD_NUMBER = 3; + public static final int KKEBECBGPLN_FIELD_NUMBER = 5; + private boolean kKEBECBGPLN_; + /** + * bool KKEBECBGPLN = 5; + * @return The kKEBECBGPLN. + */ + @java.lang.Override + public boolean getKKEBECBGPLN() { + return kKEBECBGPLN_; + } + + public static final int FORWARD_TYPE_FIELD_NUMBER = 6; private int forwardType_; /** - * .ForwardType forward_type = 3; + * .ForwardType forward_type = 6; * @return The enum numeric value on the wire for forwardType. */ @java.lang.Override public int getForwardTypeValue() { return forwardType_; } /** - * .ForwardType forward_type = 3; + * .ForwardType forward_type = 6; * @return The forwardType. */ @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() { @@ -312,125 +345,92 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwar return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result; } - public static final int CCKKABKJJGP_FIELD_NUMBER = 12; - private boolean cCKKABKJJGP_; - /** - * bool CCKKABKJJGP = 12; - * @return The cCKKABKJJGP. - */ - @java.lang.Override - public boolean getCCKKABKJJGP() { - return cCKKABKJJGP_; - } - - public static final int MDMOIMDCOPF_FIELD_NUMBER = 7; - private boolean mDMOIMDCOPF_; - /** - * bool MDMOIMDCOPF = 7; - * @return The mDMOIMDCOPF. - */ - @java.lang.Override - public boolean getMDMOIMDCOPF() { - return mDMOIMDCOPF_; - } - - public static final int ENTITY_ID_FIELD_NUMBER = 11; - private int entityId_; - /** - * uint32 entity_id = 11; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - - public static final int MCNECDNCLCJ_FIELD_NUMBER = 1; - private boolean mCNECDNCLCJ_; + public static final int BNNBNPPFBGF_FIELD_NUMBER = 7; + private boolean bNNBNPPFBGF_; /** - * bool MCNECDNCLCJ = 1; - * @return The mCNECDNCLCJ. + * bool BNNBNPPFBGF = 7; + * @return The bNNBNPPFBGF. */ @java.lang.Override - public boolean getMCNECDNCLCJ() { - return mCNECDNCLCJ_; + public boolean getBNNBNPPFBGF() { + return bNNBNPPFBGF_; } - public static final int GMLEBIHPOKD_FIELD_NUMBER = 5; - private boolean gMLEBIHPOKD_; + public static final int IEOMMIKNNIE_FIELD_NUMBER = 8; + private boolean iEOMMIKNNIE_; /** - * bool GMLEBIHPOKD = 5; - * @return The gMLEBIHPOKD. + * bool IEOMMIKNNIE = 8; + * @return The iEOMMIKNNIE. */ @java.lang.Override - public boolean getGMLEBIHPOKD() { - return gMLEBIHPOKD_; + public boolean getIEOMMIKNNIE() { + return iEOMMIKNNIE_; } - public static final int OGOLKMLFFHE_FIELD_NUMBER = 2; - private boolean oGOLKMLFFHE_; + public static final int DMIMBNDEIJO_FIELD_NUMBER = 9; + private boolean dMIMBNDEIJO_; /** - * bool OGOLKMLFFHE = 2; - * @return The oGOLKMLFFHE. + * bool DMIMBNDEIJO = 9; + * @return The dMIMBNDEIJO. */ @java.lang.Override - public boolean getOGOLKMLFFHE() { - return oGOLKMLFFHE_; + public boolean getDMIMBNDEIJO() { + return dMIMBNDEIJO_; } - public static final int OEMKCENFMIM_FIELD_NUMBER = 10; - private boolean oEMKCENFMIM_; + public static final int DDPOAJHDNAI_FIELD_NUMBER = 10; + private boolean dDPOAJHDNAI_; /** - * bool OEMKCENFMIM = 10; - * @return The oEMKCENFMIM. + * bool DDPOAJHDNAI = 10; + * @return The dDPOAJHDNAI. */ @java.lang.Override - public boolean getOEMKCENFMIM() { - return oEMKCENFMIM_; + public boolean getDDPOAJHDNAI() { + return dDPOAJHDNAI_; } - public static final int DBPHFOKBNCP_FIELD_NUMBER = 9; - private boolean dBPHFOKBNCP_; + public static final int AKOKCLCPKEI_FIELD_NUMBER = 11; + private boolean aKOKCLCPKEI_; /** - * bool DBPHFOKBNCP = 9; - * @return The dBPHFOKBNCP. + * bool AKOKCLCPKEI = 11; + * @return The aKOKCLCPKEI. */ @java.lang.Override - public boolean getDBPHFOKBNCP() { - return dBPHFOKBNCP_; + public boolean getAKOKCLCPKEI() { + return aKOKCLCPKEI_; } - public static final int PBHFFGHHPMA_FIELD_NUMBER = 15; - private boolean pBHFFGHHPMA_; + public static final int NNBLLLGBGKG_FIELD_NUMBER = 12; + private boolean nNBLLLGBGKG_; /** - * bool PBHFFGHHPMA = 15; - * @return The pBHFFGHHPMA. + * bool NNBLLLGBGKG = 12; + * @return The nNBLLLGBGKG. */ @java.lang.Override - public boolean getPBHFFGHHPMA() { - return pBHFFGHHPMA_; + public boolean getNNBLLLGBGKG() { + return nNBLLLGBGKG_; } - public static final int EGBLCMOLOMC_FIELD_NUMBER = 8; - private boolean eGBLCMOLOMC_; + public static final int ENTITY_ID_FIELD_NUMBER = 14; + private int entityId_; /** - * bool EGBLCMOLOMC = 8; - * @return The eGBLCMOLOMC. + * uint32 entity_id = 14; + * @return The entityId. */ @java.lang.Override - public boolean getEGBLCMOLOMC() { - return eGBLCMOLOMC_; + public int getEntityId() { + return entityId_; } - public static final int NACMCGNGDLN_FIELD_NUMBER = 6; - private boolean nACMCGNGDLN_; + public static final int EKMGPOIMAIL_FIELD_NUMBER = 15; + private boolean eKMGPOIMAIL_; /** - * bool NACMCGNGDLN = 6; - * @return The nACMCGNGDLN. + * bool EKMGPOIMAIL = 15; + * @return The eKMGPOIMAIL. */ @java.lang.Override - public boolean getNACMCGNGDLN() { - return nACMCGNGDLN_; + public boolean getEKMGPOIMAIL() { + return eKMGPOIMAIL_; } private byte memoizedIsInitialized = -1; @@ -447,44 +447,44 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (mCNECDNCLCJ_ != false) { - output.writeBool(1, mCNECDNCLCJ_); + if (fIJOOLAANGJ_ != false) { + output.writeBool(1, fIJOOLAANGJ_); } - if (oGOLKMLFFHE_ != false) { - output.writeBool(2, oGOLKMLFFHE_); + if (fLNEMNNKMEB_ != false) { + output.writeBool(2, fLNEMNNKMEB_); } - if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { - output.writeEnum(3, forwardType_); + if (focusForward_ != null) { + output.writeMessage(4, getFocusForward()); } - if (gMLEBIHPOKD_ != false) { - output.writeBool(5, gMLEBIHPOKD_); + if (kKEBECBGPLN_ != false) { + output.writeBool(5, kKEBECBGPLN_); } - if (nACMCGNGDLN_ != false) { - output.writeBool(6, nACMCGNGDLN_); + if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { + output.writeEnum(6, forwardType_); } - if (mDMOIMDCOPF_ != false) { - output.writeBool(7, mDMOIMDCOPF_); + if (bNNBNPPFBGF_ != false) { + output.writeBool(7, bNNBNPPFBGF_); } - if (eGBLCMOLOMC_ != false) { - output.writeBool(8, eGBLCMOLOMC_); + if (iEOMMIKNNIE_ != false) { + output.writeBool(8, iEOMMIKNNIE_); } - if (dBPHFOKBNCP_ != false) { - output.writeBool(9, dBPHFOKBNCP_); + if (dMIMBNDEIJO_ != false) { + output.writeBool(9, dMIMBNDEIJO_); } - if (oEMKCENFMIM_ != false) { - output.writeBool(10, oEMKCENFMIM_); + if (dDPOAJHDNAI_ != false) { + output.writeBool(10, dDPOAJHDNAI_); } - if (entityId_ != 0) { - output.writeUInt32(11, entityId_); + if (aKOKCLCPKEI_ != false) { + output.writeBool(11, aKOKCLCPKEI_); } - if (cCKKABKJJGP_ != false) { - output.writeBool(12, cCKKABKJJGP_); + if (nNBLLLGBGKG_ != false) { + output.writeBool(12, nNBLLLGBGKG_); } - if (focusForward_ != null) { - output.writeMessage(13, getFocusForward()); + if (entityId_ != 0) { + output.writeUInt32(14, entityId_); } - if (pBHFFGHHPMA_ != false) { - output.writeBool(15, pBHFFGHHPMA_); + if (eKMGPOIMAIL_ != false) { + output.writeBool(15, eKMGPOIMAIL_); } unknownFields.writeTo(output); } @@ -495,57 +495,57 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (mCNECDNCLCJ_ != false) { + if (fIJOOLAANGJ_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, mCNECDNCLCJ_); + .computeBoolSize(1, fIJOOLAANGJ_); } - if (oGOLKMLFFHE_ != false) { + if (fLNEMNNKMEB_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, oGOLKMLFFHE_); + .computeBoolSize(2, fLNEMNNKMEB_); } - if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { + if (focusForward_ != null) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(3, forwardType_); + .computeMessageSize(4, getFocusForward()); } - if (gMLEBIHPOKD_ != false) { + if (kKEBECBGPLN_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(5, gMLEBIHPOKD_); + .computeBoolSize(5, kKEBECBGPLN_); } - if (nACMCGNGDLN_ != false) { + if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, nACMCGNGDLN_); + .computeEnumSize(6, forwardType_); } - if (mDMOIMDCOPF_ != false) { + if (bNNBNPPFBGF_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, mDMOIMDCOPF_); + .computeBoolSize(7, bNNBNPPFBGF_); } - if (eGBLCMOLOMC_ != false) { + if (iEOMMIKNNIE_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(8, eGBLCMOLOMC_); + .computeBoolSize(8, iEOMMIKNNIE_); } - if (dBPHFOKBNCP_ != false) { + if (dMIMBNDEIJO_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(9, dBPHFOKBNCP_); + .computeBoolSize(9, dMIMBNDEIJO_); } - if (oEMKCENFMIM_ != false) { + if (dDPOAJHDNAI_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(10, oEMKCENFMIM_); + .computeBoolSize(10, dDPOAJHDNAI_); } - if (entityId_ != 0) { + if (aKOKCLCPKEI_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, entityId_); + .computeBoolSize(11, aKOKCLCPKEI_); } - if (cCKKABKJJGP_ != false) { + if (nNBLLLGBGKG_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(12, cCKKABKJJGP_); + .computeBoolSize(12, nNBLLLGBGKG_); } - if (focusForward_ != null) { + if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, getFocusForward()); + .computeUInt32Size(14, entityId_); } - if (pBHFFGHHPMA_ != false) { + if (eKMGPOIMAIL_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(15, pBHFFGHHPMA_); + .computeBoolSize(15, eKMGPOIMAIL_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -562,34 +562,34 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify other = (emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify) obj; + if (getFIJOOLAANGJ() + != other.getFIJOOLAANGJ()) return false; + if (getFLNEMNNKMEB() + != other.getFLNEMNNKMEB()) return false; if (hasFocusForward() != other.hasFocusForward()) return false; if (hasFocusForward()) { if (!getFocusForward() .equals(other.getFocusForward())) return false; } + if (getKKEBECBGPLN() + != other.getKKEBECBGPLN()) return false; if (forwardType_ != other.forwardType_) return false; - if (getCCKKABKJJGP() - != other.getCCKKABKJJGP()) return false; - if (getMDMOIMDCOPF() - != other.getMDMOIMDCOPF()) return false; + if (getBNNBNPPFBGF() + != other.getBNNBNPPFBGF()) return false; + if (getIEOMMIKNNIE() + != other.getIEOMMIKNNIE()) return false; + if (getDMIMBNDEIJO() + != other.getDMIMBNDEIJO()) return false; + if (getDDPOAJHDNAI() + != other.getDDPOAJHDNAI()) return false; + if (getAKOKCLCPKEI() + != other.getAKOKCLCPKEI()) return false; + if (getNNBLLLGBGKG() + != other.getNNBLLLGBGKG()) return false; if (getEntityId() != other.getEntityId()) return false; - if (getMCNECDNCLCJ() - != other.getMCNECDNCLCJ()) return false; - if (getGMLEBIHPOKD() - != other.getGMLEBIHPOKD()) return false; - if (getOGOLKMLFFHE() - != other.getOGOLKMLFFHE()) return false; - if (getOEMKCENFMIM() - != other.getOEMKCENFMIM()) return false; - if (getDBPHFOKBNCP() - != other.getDBPHFOKBNCP()) return false; - if (getPBHFFGHHPMA() - != other.getPBHFFGHHPMA()) return false; - if (getEGBLCMOLOMC() - != other.getEGBLCMOLOMC()) return false; - if (getNACMCGNGDLN() - != other.getNACMCGNGDLN()) return false; + if (getEKMGPOIMAIL() + != other.getEKMGPOIMAIL()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -601,44 +601,44 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + FIJOOLAANGJ_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getFIJOOLAANGJ()); + hash = (37 * hash) + FLNEMNNKMEB_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getFLNEMNNKMEB()); if (hasFocusForward()) { hash = (37 * hash) + FOCUS_FORWARD_FIELD_NUMBER; hash = (53 * hash) + getFocusForward().hashCode(); } + hash = (37 * hash) + KKEBECBGPLN_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getKKEBECBGPLN()); hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER; hash = (53 * hash) + forwardType_; - hash = (37 * hash) + CCKKABKJJGP_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getCCKKABKJJGP()); - hash = (37 * hash) + MDMOIMDCOPF_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getMDMOIMDCOPF()); - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); - hash = (37 * hash) + MCNECDNCLCJ_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getMCNECDNCLCJ()); - hash = (37 * hash) + GMLEBIHPOKD_FIELD_NUMBER; + hash = (37 * hash) + BNNBNPPFBGF_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getGMLEBIHPOKD()); - hash = (37 * hash) + OGOLKMLFFHE_FIELD_NUMBER; + getBNNBNPPFBGF()); + hash = (37 * hash) + IEOMMIKNNIE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getOGOLKMLFFHE()); - hash = (37 * hash) + OEMKCENFMIM_FIELD_NUMBER; + getIEOMMIKNNIE()); + hash = (37 * hash) + DMIMBNDEIJO_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getOEMKCENFMIM()); - hash = (37 * hash) + DBPHFOKBNCP_FIELD_NUMBER; + getDMIMBNDEIJO()); + hash = (37 * hash) + DDPOAJHDNAI_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getDBPHFOKBNCP()); - hash = (37 * hash) + PBHFFGHHPMA_FIELD_NUMBER; + getDDPOAJHDNAI()); + hash = (37 * hash) + AKOKCLCPKEI_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getPBHFFGHHPMA()); - hash = (37 * hash) + EGBLCMOLOMC_FIELD_NUMBER; + getAKOKCLCPKEI()); + hash = (37 * hash) + NNBLLLGBGKG_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getEGBLCMOLOMC()); - hash = (37 * hash) + NACMCGNGDLN_FIELD_NUMBER; + getNNBLLLGBGKG()); + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); + hash = (37 * hash) + EKMGPOIMAIL_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getNACMCGNGDLN()); + getEKMGPOIMAIL()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -736,8 +736,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20643
-     * Obf: CMOGIHEMPNF
+     * CmdId: 29042
+     * obf: FGEMHAFCPPI
      *
* * Protobuf type {@code EvtAvatarEnterFocusNotify} @@ -777,35 +777,35 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + fIJOOLAANGJ_ = false; + + fLNEMNNKMEB_ = false; + if (focusForwardBuilder_ == null) { focusForward_ = null; } else { focusForward_ = null; focusForwardBuilder_ = null; } - forwardType_ = 0; - - cCKKABKJJGP_ = false; + kKEBECBGPLN_ = false; - mDMOIMDCOPF_ = false; - - entityId_ = 0; + forwardType_ = 0; - mCNECDNCLCJ_ = false; + bNNBNPPFBGF_ = false; - gMLEBIHPOKD_ = false; + iEOMMIKNNIE_ = false; - oGOLKMLFFHE_ = false; + dMIMBNDEIJO_ = false; - oEMKCENFMIM_ = false; + dDPOAJHDNAI_ = false; - dBPHFOKBNCP_ = false; + aKOKCLCPKEI_ = false; - pBHFFGHHPMA_ = false; + nNBLLLGBGKG_ = false; - eGBLCMOLOMC_ = false; + entityId_ = 0; - nACMCGNGDLN_ = false; + eKMGPOIMAIL_ = false; return this; } @@ -833,23 +833,23 @@ public emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEn @java.lang.Override public emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify buildPartial() { emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify result = new emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify(this); + result.fIJOOLAANGJ_ = fIJOOLAANGJ_; + result.fLNEMNNKMEB_ = fLNEMNNKMEB_; if (focusForwardBuilder_ == null) { result.focusForward_ = focusForward_; } else { result.focusForward_ = focusForwardBuilder_.build(); } + result.kKEBECBGPLN_ = kKEBECBGPLN_; result.forwardType_ = forwardType_; - result.cCKKABKJJGP_ = cCKKABKJJGP_; - result.mDMOIMDCOPF_ = mDMOIMDCOPF_; + result.bNNBNPPFBGF_ = bNNBNPPFBGF_; + result.iEOMMIKNNIE_ = iEOMMIKNNIE_; + result.dMIMBNDEIJO_ = dMIMBNDEIJO_; + result.dDPOAJHDNAI_ = dDPOAJHDNAI_; + result.aKOKCLCPKEI_ = aKOKCLCPKEI_; + result.nNBLLLGBGKG_ = nNBLLLGBGKG_; result.entityId_ = entityId_; - result.mCNECDNCLCJ_ = mCNECDNCLCJ_; - result.gMLEBIHPOKD_ = gMLEBIHPOKD_; - result.oGOLKMLFFHE_ = oGOLKMLFFHE_; - result.oEMKCENFMIM_ = oEMKCENFMIM_; - result.dBPHFOKBNCP_ = dBPHFOKBNCP_; - result.pBHFFGHHPMA_ = pBHFFGHHPMA_; - result.eGBLCMOLOMC_ = eGBLCMOLOMC_; - result.nACMCGNGDLN_ = nACMCGNGDLN_; + result.eKMGPOIMAIL_ = eKMGPOIMAIL_; onBuilt(); return result; } @@ -898,44 +898,44 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify other) { if (other == emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEnterFocusNotify.getDefaultInstance()) return this; + if (other.getFIJOOLAANGJ() != false) { + setFIJOOLAANGJ(other.getFIJOOLAANGJ()); + } + if (other.getFLNEMNNKMEB() != false) { + setFLNEMNNKMEB(other.getFLNEMNNKMEB()); + } if (other.hasFocusForward()) { mergeFocusForward(other.getFocusForward()); } + if (other.getKKEBECBGPLN() != false) { + setKKEBECBGPLN(other.getKKEBECBGPLN()); + } if (other.forwardType_ != 0) { setForwardTypeValue(other.getForwardTypeValue()); } - if (other.getCCKKABKJJGP() != false) { - setCCKKABKJJGP(other.getCCKKABKJJGP()); - } - if (other.getMDMOIMDCOPF() != false) { - setMDMOIMDCOPF(other.getMDMOIMDCOPF()); - } - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); - } - if (other.getMCNECDNCLCJ() != false) { - setMCNECDNCLCJ(other.getMCNECDNCLCJ()); + if (other.getBNNBNPPFBGF() != false) { + setBNNBNPPFBGF(other.getBNNBNPPFBGF()); } - if (other.getGMLEBIHPOKD() != false) { - setGMLEBIHPOKD(other.getGMLEBIHPOKD()); + if (other.getIEOMMIKNNIE() != false) { + setIEOMMIKNNIE(other.getIEOMMIKNNIE()); } - if (other.getOGOLKMLFFHE() != false) { - setOGOLKMLFFHE(other.getOGOLKMLFFHE()); + if (other.getDMIMBNDEIJO() != false) { + setDMIMBNDEIJO(other.getDMIMBNDEIJO()); } - if (other.getOEMKCENFMIM() != false) { - setOEMKCENFMIM(other.getOEMKCENFMIM()); + if (other.getDDPOAJHDNAI() != false) { + setDDPOAJHDNAI(other.getDDPOAJHDNAI()); } - if (other.getDBPHFOKBNCP() != false) { - setDBPHFOKBNCP(other.getDBPHFOKBNCP()); + if (other.getAKOKCLCPKEI() != false) { + setAKOKCLCPKEI(other.getAKOKCLCPKEI()); } - if (other.getPBHFFGHHPMA() != false) { - setPBHFFGHHPMA(other.getPBHFFGHHPMA()); + if (other.getNNBLLLGBGKG() != false) { + setNNBLLLGBGKG(other.getNNBLLLGBGKG()); } - if (other.getEGBLCMOLOMC() != false) { - setEGBLCMOLOMC(other.getEGBLCMOLOMC()); + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); } - if (other.getNACMCGNGDLN() != false) { - setNACMCGNGDLN(other.getNACMCGNGDLN()); + if (other.getEKMGPOIMAIL() != false) { + setEKMGPOIMAIL(other.getEKMGPOIMAIL()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -966,18 +966,80 @@ public Builder mergeFrom( return this; } + private boolean fIJOOLAANGJ_ ; + /** + * bool FIJOOLAANGJ = 1; + * @return The fIJOOLAANGJ. + */ + @java.lang.Override + public boolean getFIJOOLAANGJ() { + return fIJOOLAANGJ_; + } + /** + * bool FIJOOLAANGJ = 1; + * @param value The fIJOOLAANGJ to set. + * @return This builder for chaining. + */ + public Builder setFIJOOLAANGJ(boolean value) { + + fIJOOLAANGJ_ = value; + onChanged(); + return this; + } + /** + * bool FIJOOLAANGJ = 1; + * @return This builder for chaining. + */ + public Builder clearFIJOOLAANGJ() { + + fIJOOLAANGJ_ = false; + onChanged(); + return this; + } + + private boolean fLNEMNNKMEB_ ; + /** + * bool FLNEMNNKMEB = 2; + * @return The fLNEMNNKMEB. + */ + @java.lang.Override + public boolean getFLNEMNNKMEB() { + return fLNEMNNKMEB_; + } + /** + * bool FLNEMNNKMEB = 2; + * @param value The fLNEMNNKMEB to set. + * @return This builder for chaining. + */ + public Builder setFLNEMNNKMEB(boolean value) { + + fLNEMNNKMEB_ = value; + onChanged(); + return this; + } + /** + * bool FLNEMNNKMEB = 2; + * @return This builder for chaining. + */ + public Builder clearFLNEMNNKMEB() { + + fLNEMNNKMEB_ = false; + onChanged(); + return this; + } + private emu.grasscutter.net.proto.VectorOuterClass.Vector focusForward_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> focusForwardBuilder_; /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; * @return Whether the focusForward field is set. */ public boolean hasFocusForward() { return focusForwardBuilder_ != null || focusForward_ != null; } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; * @return The focusForward. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getFocusForward() { @@ -988,7 +1050,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getFocusForward() { } } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ public Builder setFocusForward(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (focusForwardBuilder_ == null) { @@ -1004,7 +1066,7 @@ public Builder setFocusForward(emu.grasscutter.net.proto.VectorOuterClass.Vector return this; } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ public Builder setFocusForward( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -1018,7 +1080,7 @@ public Builder setFocusForward( return this; } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ public Builder mergeFocusForward(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (focusForwardBuilder_ == null) { @@ -1036,7 +1098,7 @@ public Builder mergeFocusForward(emu.grasscutter.net.proto.VectorOuterClass.Vect return this; } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ public Builder clearFocusForward() { if (focusForwardBuilder_ == null) { @@ -1050,7 +1112,7 @@ public Builder clearFocusForward() { return this; } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getFocusForwardBuilder() { @@ -1058,7 +1120,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getFocusForward return getFocusForwardFieldBuilder().getBuilder(); } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwardOrBuilder() { if (focusForwardBuilder_ != null) { @@ -1069,7 +1131,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwar } } /** - * .Vector focus_forward = 13; + * .Vector focus_forward = 4; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -1085,16 +1147,47 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwar return focusForwardBuilder_; } + private boolean kKEBECBGPLN_ ; + /** + * bool KKEBECBGPLN = 5; + * @return The kKEBECBGPLN. + */ + @java.lang.Override + public boolean getKKEBECBGPLN() { + return kKEBECBGPLN_; + } + /** + * bool KKEBECBGPLN = 5; + * @param value The kKEBECBGPLN to set. + * @return This builder for chaining. + */ + public Builder setKKEBECBGPLN(boolean value) { + + kKEBECBGPLN_ = value; + onChanged(); + return this; + } + /** + * bool KKEBECBGPLN = 5; + * @return This builder for chaining. + */ + public Builder clearKKEBECBGPLN() { + + kKEBECBGPLN_ = false; + onChanged(); + return this; + } + private int forwardType_ = 0; /** - * .ForwardType forward_type = 3; + * .ForwardType forward_type = 6; * @return The enum numeric value on the wire for forwardType. */ @java.lang.Override public int getForwardTypeValue() { return forwardType_; } /** - * .ForwardType forward_type = 3; + * .ForwardType forward_type = 6; * @param value The enum numeric value on the wire for forwardType to set. * @return This builder for chaining. */ @@ -1105,7 +1198,7 @@ public Builder setForwardTypeValue(int value) { return this; } /** - * .ForwardType forward_type = 3; + * .ForwardType forward_type = 6; * @return The forwardType. */ @java.lang.Override @@ -1115,7 +1208,7 @@ public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardTyp return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result; } /** - * .ForwardType forward_type = 3; + * .ForwardType forward_type = 6; * @param value The forwardType to set. * @return This builder for chaining. */ @@ -1129,7 +1222,7 @@ public Builder setForwardType(emu.grasscutter.net.proto.ForwardTypeOuterClass.Fo return this; } /** - * .ForwardType forward_type = 3; + * .ForwardType forward_type = 6; * @return This builder for chaining. */ public Builder clearForwardType() { @@ -1139,343 +1232,250 @@ public Builder clearForwardType() { return this; } - private boolean cCKKABKJJGP_ ; - /** - * bool CCKKABKJJGP = 12; - * @return The cCKKABKJJGP. - */ - @java.lang.Override - public boolean getCCKKABKJJGP() { - return cCKKABKJJGP_; - } - /** - * bool CCKKABKJJGP = 12; - * @param value The cCKKABKJJGP to set. - * @return This builder for chaining. - */ - public Builder setCCKKABKJJGP(boolean value) { - - cCKKABKJJGP_ = value; - onChanged(); - return this; - } - /** - * bool CCKKABKJJGP = 12; - * @return This builder for chaining. - */ - public Builder clearCCKKABKJJGP() { - - cCKKABKJJGP_ = false; - onChanged(); - return this; - } - - private boolean mDMOIMDCOPF_ ; - /** - * bool MDMOIMDCOPF = 7; - * @return The mDMOIMDCOPF. - */ - @java.lang.Override - public boolean getMDMOIMDCOPF() { - return mDMOIMDCOPF_; - } - /** - * bool MDMOIMDCOPF = 7; - * @param value The mDMOIMDCOPF to set. - * @return This builder for chaining. - */ - public Builder setMDMOIMDCOPF(boolean value) { - - mDMOIMDCOPF_ = value; - onChanged(); - return this; - } - /** - * bool MDMOIMDCOPF = 7; - * @return This builder for chaining. - */ - public Builder clearMDMOIMDCOPF() { - - mDMOIMDCOPF_ = false; - onChanged(); - return this; - } - - private int entityId_ ; - /** - * uint32 entity_id = 11; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - /** - * uint32 entity_id = 11; - * @param value The entityId to set. - * @return This builder for chaining. - */ - public Builder setEntityId(int value) { - - entityId_ = value; - onChanged(); - return this; - } - /** - * uint32 entity_id = 11; - * @return This builder for chaining. - */ - public Builder clearEntityId() { - - entityId_ = 0; - onChanged(); - return this; - } - - private boolean mCNECDNCLCJ_ ; + private boolean bNNBNPPFBGF_ ; /** - * bool MCNECDNCLCJ = 1; - * @return The mCNECDNCLCJ. + * bool BNNBNPPFBGF = 7; + * @return The bNNBNPPFBGF. */ @java.lang.Override - public boolean getMCNECDNCLCJ() { - return mCNECDNCLCJ_; + public boolean getBNNBNPPFBGF() { + return bNNBNPPFBGF_; } /** - * bool MCNECDNCLCJ = 1; - * @param value The mCNECDNCLCJ to set. + * bool BNNBNPPFBGF = 7; + * @param value The bNNBNPPFBGF to set. * @return This builder for chaining. */ - public Builder setMCNECDNCLCJ(boolean value) { + public Builder setBNNBNPPFBGF(boolean value) { - mCNECDNCLCJ_ = value; + bNNBNPPFBGF_ = value; onChanged(); return this; } /** - * bool MCNECDNCLCJ = 1; + * bool BNNBNPPFBGF = 7; * @return This builder for chaining. */ - public Builder clearMCNECDNCLCJ() { + public Builder clearBNNBNPPFBGF() { - mCNECDNCLCJ_ = false; + bNNBNPPFBGF_ = false; onChanged(); return this; } - private boolean gMLEBIHPOKD_ ; + private boolean iEOMMIKNNIE_ ; /** - * bool GMLEBIHPOKD = 5; - * @return The gMLEBIHPOKD. + * bool IEOMMIKNNIE = 8; + * @return The iEOMMIKNNIE. */ @java.lang.Override - public boolean getGMLEBIHPOKD() { - return gMLEBIHPOKD_; + public boolean getIEOMMIKNNIE() { + return iEOMMIKNNIE_; } /** - * bool GMLEBIHPOKD = 5; - * @param value The gMLEBIHPOKD to set. + * bool IEOMMIKNNIE = 8; + * @param value The iEOMMIKNNIE to set. * @return This builder for chaining. */ - public Builder setGMLEBIHPOKD(boolean value) { + public Builder setIEOMMIKNNIE(boolean value) { - gMLEBIHPOKD_ = value; + iEOMMIKNNIE_ = value; onChanged(); return this; } /** - * bool GMLEBIHPOKD = 5; + * bool IEOMMIKNNIE = 8; * @return This builder for chaining. */ - public Builder clearGMLEBIHPOKD() { + public Builder clearIEOMMIKNNIE() { - gMLEBIHPOKD_ = false; + iEOMMIKNNIE_ = false; onChanged(); return this; } - private boolean oGOLKMLFFHE_ ; + private boolean dMIMBNDEIJO_ ; /** - * bool OGOLKMLFFHE = 2; - * @return The oGOLKMLFFHE. + * bool DMIMBNDEIJO = 9; + * @return The dMIMBNDEIJO. */ @java.lang.Override - public boolean getOGOLKMLFFHE() { - return oGOLKMLFFHE_; + public boolean getDMIMBNDEIJO() { + return dMIMBNDEIJO_; } /** - * bool OGOLKMLFFHE = 2; - * @param value The oGOLKMLFFHE to set. + * bool DMIMBNDEIJO = 9; + * @param value The dMIMBNDEIJO to set. * @return This builder for chaining. */ - public Builder setOGOLKMLFFHE(boolean value) { + public Builder setDMIMBNDEIJO(boolean value) { - oGOLKMLFFHE_ = value; + dMIMBNDEIJO_ = value; onChanged(); return this; } /** - * bool OGOLKMLFFHE = 2; + * bool DMIMBNDEIJO = 9; * @return This builder for chaining. */ - public Builder clearOGOLKMLFFHE() { + public Builder clearDMIMBNDEIJO() { - oGOLKMLFFHE_ = false; + dMIMBNDEIJO_ = false; onChanged(); return this; } - private boolean oEMKCENFMIM_ ; + private boolean dDPOAJHDNAI_ ; /** - * bool OEMKCENFMIM = 10; - * @return The oEMKCENFMIM. + * bool DDPOAJHDNAI = 10; + * @return The dDPOAJHDNAI. */ @java.lang.Override - public boolean getOEMKCENFMIM() { - return oEMKCENFMIM_; + public boolean getDDPOAJHDNAI() { + return dDPOAJHDNAI_; } /** - * bool OEMKCENFMIM = 10; - * @param value The oEMKCENFMIM to set. + * bool DDPOAJHDNAI = 10; + * @param value The dDPOAJHDNAI to set. * @return This builder for chaining. */ - public Builder setOEMKCENFMIM(boolean value) { + public Builder setDDPOAJHDNAI(boolean value) { - oEMKCENFMIM_ = value; + dDPOAJHDNAI_ = value; onChanged(); return this; } /** - * bool OEMKCENFMIM = 10; + * bool DDPOAJHDNAI = 10; * @return This builder for chaining. */ - public Builder clearOEMKCENFMIM() { + public Builder clearDDPOAJHDNAI() { - oEMKCENFMIM_ = false; + dDPOAJHDNAI_ = false; onChanged(); return this; } - private boolean dBPHFOKBNCP_ ; + private boolean aKOKCLCPKEI_ ; /** - * bool DBPHFOKBNCP = 9; - * @return The dBPHFOKBNCP. + * bool AKOKCLCPKEI = 11; + * @return The aKOKCLCPKEI. */ @java.lang.Override - public boolean getDBPHFOKBNCP() { - return dBPHFOKBNCP_; + public boolean getAKOKCLCPKEI() { + return aKOKCLCPKEI_; } /** - * bool DBPHFOKBNCP = 9; - * @param value The dBPHFOKBNCP to set. + * bool AKOKCLCPKEI = 11; + * @param value The aKOKCLCPKEI to set. * @return This builder for chaining. */ - public Builder setDBPHFOKBNCP(boolean value) { + public Builder setAKOKCLCPKEI(boolean value) { - dBPHFOKBNCP_ = value; + aKOKCLCPKEI_ = value; onChanged(); return this; } /** - * bool DBPHFOKBNCP = 9; + * bool AKOKCLCPKEI = 11; * @return This builder for chaining. */ - public Builder clearDBPHFOKBNCP() { + public Builder clearAKOKCLCPKEI() { - dBPHFOKBNCP_ = false; + aKOKCLCPKEI_ = false; onChanged(); return this; } - private boolean pBHFFGHHPMA_ ; + private boolean nNBLLLGBGKG_ ; /** - * bool PBHFFGHHPMA = 15; - * @return The pBHFFGHHPMA. + * bool NNBLLLGBGKG = 12; + * @return The nNBLLLGBGKG. */ @java.lang.Override - public boolean getPBHFFGHHPMA() { - return pBHFFGHHPMA_; + public boolean getNNBLLLGBGKG() { + return nNBLLLGBGKG_; } /** - * bool PBHFFGHHPMA = 15; - * @param value The pBHFFGHHPMA to set. + * bool NNBLLLGBGKG = 12; + * @param value The nNBLLLGBGKG to set. * @return This builder for chaining. */ - public Builder setPBHFFGHHPMA(boolean value) { + public Builder setNNBLLLGBGKG(boolean value) { - pBHFFGHHPMA_ = value; + nNBLLLGBGKG_ = value; onChanged(); return this; } /** - * bool PBHFFGHHPMA = 15; + * bool NNBLLLGBGKG = 12; * @return This builder for chaining. */ - public Builder clearPBHFFGHHPMA() { + public Builder clearNNBLLLGBGKG() { - pBHFFGHHPMA_ = false; + nNBLLLGBGKG_ = false; onChanged(); return this; } - private boolean eGBLCMOLOMC_ ; + private int entityId_ ; /** - * bool EGBLCMOLOMC = 8; - * @return The eGBLCMOLOMC. + * uint32 entity_id = 14; + * @return The entityId. */ @java.lang.Override - public boolean getEGBLCMOLOMC() { - return eGBLCMOLOMC_; + public int getEntityId() { + return entityId_; } /** - * bool EGBLCMOLOMC = 8; - * @param value The eGBLCMOLOMC to set. + * uint32 entity_id = 14; + * @param value The entityId to set. * @return This builder for chaining. */ - public Builder setEGBLCMOLOMC(boolean value) { + public Builder setEntityId(int value) { - eGBLCMOLOMC_ = value; + entityId_ = value; onChanged(); return this; } /** - * bool EGBLCMOLOMC = 8; + * uint32 entity_id = 14; * @return This builder for chaining. */ - public Builder clearEGBLCMOLOMC() { + public Builder clearEntityId() { - eGBLCMOLOMC_ = false; + entityId_ = 0; onChanged(); return this; } - private boolean nACMCGNGDLN_ ; + private boolean eKMGPOIMAIL_ ; /** - * bool NACMCGNGDLN = 6; - * @return The nACMCGNGDLN. + * bool EKMGPOIMAIL = 15; + * @return The eKMGPOIMAIL. */ @java.lang.Override - public boolean getNACMCGNGDLN() { - return nACMCGNGDLN_; + public boolean getEKMGPOIMAIL() { + return eKMGPOIMAIL_; } /** - * bool NACMCGNGDLN = 6; - * @param value The nACMCGNGDLN to set. + * bool EKMGPOIMAIL = 15; + * @param value The eKMGPOIMAIL to set. * @return This builder for chaining. */ - public Builder setNACMCGNGDLN(boolean value) { + public Builder setEKMGPOIMAIL(boolean value) { - nACMCGNGDLN_ = value; + eKMGPOIMAIL_ = value; onChanged(); return this; } /** - * bool NACMCGNGDLN = 6; + * bool EKMGPOIMAIL = 15; * @return This builder for chaining. */ - public Builder clearNACMCGNGDLN() { + public Builder clearEKMGPOIMAIL() { - nACMCGNGDLN_ = false; + eKMGPOIMAIL_ = false; onChanged(); return this; } @@ -1548,14 +1548,14 @@ public emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEn java.lang.String[] descriptorData = { "\n\037EvtAvatarEnterFocusNotify.proto\032\014Vecto" + "r.proto\032\021ForwardType.proto\"\304\002\n\031EvtAvatar" + - "EnterFocusNotify\022\036\n\rfocus_forward\030\r \001(\0132" + - "\007.Vector\022\"\n\014forward_type\030\003 \001(\0162\014.Forward" + - "Type\022\023\n\013CCKKABKJJGP\030\014 \001(\010\022\023\n\013MDMOIMDCOPF" + - "\030\007 \001(\010\022\021\n\tentity_id\030\013 \001(\r\022\023\n\013MCNECDNCLCJ" + - "\030\001 \001(\010\022\023\n\013GMLEBIHPOKD\030\005 \001(\010\022\023\n\013OGOLKMLFF" + - "HE\030\002 \001(\010\022\023\n\013OEMKCENFMIM\030\n \001(\010\022\023\n\013DBPHFOK" + - "BNCP\030\t \001(\010\022\023\n\013PBHFFGHHPMA\030\017 \001(\010\022\023\n\013EGBLC" + - "MOLOMC\030\010 \001(\010\022\023\n\013NACMCGNGDLN\030\006 \001(\010B\033\n\031emu" + + "EnterFocusNotify\022\023\n\013FIJOOLAANGJ\030\001 \001(\010\022\023\n" + + "\013FLNEMNNKMEB\030\002 \001(\010\022\036\n\rfocus_forward\030\004 \001(" + + "\0132\007.Vector\022\023\n\013KKEBECBGPLN\030\005 \001(\010\022\"\n\014forwa" + + "rd_type\030\006 \001(\0162\014.ForwardType\022\023\n\013BNNBNPPFB" + + "GF\030\007 \001(\010\022\023\n\013IEOMMIKNNIE\030\010 \001(\010\022\023\n\013DMIMBND" + + "EIJO\030\t \001(\010\022\023\n\013DDPOAJHDNAI\030\n \001(\010\022\023\n\013AKOKC" + + "LCPKEI\030\013 \001(\010\022\023\n\013NNBLLLGBGKG\030\014 \001(\010\022\021\n\tent" + + "ity_id\030\016 \001(\r\022\023\n\013EKMGPOIMAIL\030\017 \001(\010B\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1569,7 +1569,7 @@ public emu.grasscutter.net.proto.EvtAvatarEnterFocusNotifyOuterClass.EvtAvatarEn internal_static_EvtAvatarEnterFocusNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_EvtAvatarEnterFocusNotify_descriptor, - new java.lang.String[] { "FocusForward", "ForwardType", "CCKKABKJJGP", "MDMOIMDCOPF", "EntityId", "MCNECDNCLCJ", "GMLEBIHPOKD", "OGOLKMLFFHE", "OEMKCENFMIM", "DBPHFOKBNCP", "PBHFFGHHPMA", "EGBLCMOLOMC", "NACMCGNGDLN", }); + new java.lang.String[] { "FIJOOLAANGJ", "FLNEMNNKMEB", "FocusForward", "KKEBECBGPLN", "ForwardType", "BNNBNPPFBGF", "IEOMMIKNNIE", "DMIMBNDEIJO", "DDPOAJHDNAI", "AKOKCLCPKEI", "NNBLLLGBGKG", "EntityId", "EKMGPOIMAIL", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarExitFocusNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarExitFocusNotifyOuterClass.java index 9f0b41c5006..c3b536dee30 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarExitFocusNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarExitFocusNotifyOuterClass.java @@ -19,41 +19,41 @@ public interface EvtAvatarExitFocusNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector finish_forward = 13; - * @return Whether the finishForward field is set. - */ - boolean hasFinishForward(); - /** - * .Vector finish_forward = 13; - * @return The finishForward. - */ - emu.grasscutter.net.proto.VectorOuterClass.Vector getFinishForward(); - /** - * .Vector finish_forward = 13; + * uint32 entity_id = 2; + * @return The entityId. */ - emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFinishForwardOrBuilder(); + int getEntityId(); /** - * .ForwardType forward_type = 12; + * .ForwardType forward_type = 5; * @return The enum numeric value on the wire for forwardType. */ int getForwardTypeValue(); /** - * .ForwardType forward_type = 12; + * .ForwardType forward_type = 5; * @return The forwardType. */ emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType(); /** - * uint32 entity_id = 11; - * @return The entityId. + * .Vector finish_forward = 13; + * @return Whether the finishForward field is set. */ - int getEntityId(); + boolean hasFinishForward(); + /** + * .Vector finish_forward = 13; + * @return The finishForward. + */ + emu.grasscutter.net.proto.VectorOuterClass.Vector getFinishForward(); + /** + * .Vector finish_forward = 13; + */ + emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFinishForwardOrBuilder(); } /** * 
-   * CmdId: 24354
-   * Obf: BDJMGLMLENA
+   * CmdId: 20290
+   * obf: FJMPEDGCKBH
    *
* * Protobuf type {@code EvtAvatarExitFocusNotify} @@ -101,12 +101,12 @@ private EvtAvatarExitFocusNotify( case 0: done = true; break; - case 88: { + case 16: { entityId_ = input.readUInt32(); break; } - case 96: { + case 40: { int rawValue = input.readEnum(); forwardType_ = rawValue; @@ -157,43 +157,28 @@ private EvtAvatarExitFocusNotify( emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify.class, emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify.Builder.class); } - public static final int FINISH_FORWARD_FIELD_NUMBER = 13; - private emu.grasscutter.net.proto.VectorOuterClass.Vector finishForward_; - /** - * .Vector finish_forward = 13; - * @return Whether the finishForward field is set. - */ - @java.lang.Override - public boolean hasFinishForward() { - return finishForward_ != null; - } - /** - * .Vector finish_forward = 13; - * @return The finishForward. - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getFinishForward() { - return finishForward_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : finishForward_; - } + public static final int ENTITY_ID_FIELD_NUMBER = 2; + private int entityId_; /** - * .Vector finish_forward = 13; + * uint32 entity_id = 2; + * @return The entityId. */ @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFinishForwardOrBuilder() { - return getFinishForward(); + public int getEntityId() { + return entityId_; } - public static final int FORWARD_TYPE_FIELD_NUMBER = 12; + public static final int FORWARD_TYPE_FIELD_NUMBER = 5; private int forwardType_; /** - * .ForwardType forward_type = 12; + * .ForwardType forward_type = 5; * @return The enum numeric value on the wire for forwardType. */ @java.lang.Override public int getForwardTypeValue() { return forwardType_; } /** - * .ForwardType forward_type = 12; + * .ForwardType forward_type = 5; * @return The forwardType. */ @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() { @@ -202,15 +187,30 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFinishForwa return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result; } - public static final int ENTITY_ID_FIELD_NUMBER = 11; - private int entityId_; + public static final int FINISH_FORWARD_FIELD_NUMBER = 13; + private emu.grasscutter.net.proto.VectorOuterClass.Vector finishForward_; /** - * uint32 entity_id = 11; - * @return The entityId. + * .Vector finish_forward = 13; + * @return Whether the finishForward field is set. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public boolean hasFinishForward() { + return finishForward_ != null; + } + /** + * .Vector finish_forward = 13; + * @return The finishForward. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getFinishForward() { + return finishForward_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : finishForward_; + } + /** + * .Vector finish_forward = 13; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFinishForwardOrBuilder() { + return getFinishForward(); } private byte memoizedIsInitialized = -1; @@ -228,10 +228,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (entityId_ != 0) { - output.writeUInt32(11, entityId_); + output.writeUInt32(2, entityId_); } if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { - output.writeEnum(12, forwardType_); + output.writeEnum(5, forwardType_); } if (finishForward_ != null) { output.writeMessage(13, getFinishForward()); @@ -247,11 +247,11 @@ public int getSerializedSize() { size = 0; if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, entityId_); + .computeUInt32Size(2, entityId_); } if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(12, forwardType_); + .computeEnumSize(5, forwardType_); } if (finishForward_ != null) { size += com.google.protobuf.CodedOutputStream @@ -272,14 +272,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify other = (emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify) obj; + if (getEntityId() + != other.getEntityId()) return false; + if (forwardType_ != other.forwardType_) return false; if (hasFinishForward() != other.hasFinishForward()) return false; if (hasFinishForward()) { if (!getFinishForward() .equals(other.getFinishForward())) return false; } - if (forwardType_ != other.forwardType_) return false; - if (getEntityId() - != other.getEntityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -291,14 +291,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); + hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER; + hash = (53 * hash) + forwardType_; if (hasFinishForward()) { hash = (37 * hash) + FINISH_FORWARD_FIELD_NUMBER; hash = (53 * hash) + getFinishForward().hashCode(); } - hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER; - hash = (53 * hash) + forwardType_; - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -396,8 +396,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 24354
-     * Obf: BDJMGLMLENA
+     * CmdId: 20290
+     * obf: FJMPEDGCKBH
      *
* * Protobuf type {@code EvtAvatarExitFocusNotify} @@ -437,16 +437,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + entityId_ = 0; + + forwardType_ = 0; + if (finishForwardBuilder_ == null) { finishForward_ = null; } else { finishForward_ = null; finishForwardBuilder_ = null; } - forwardType_ = 0; - - entityId_ = 0; - return this; } @@ -473,13 +473,13 @@ public emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExi @java.lang.Override public emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify buildPartial() { emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify result = new emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify(this); + result.entityId_ = entityId_; + result.forwardType_ = forwardType_; if (finishForwardBuilder_ == null) { result.finishForward_ = finishForward_; } else { result.finishForward_ = finishForwardBuilder_.build(); } - result.forwardType_ = forwardType_; - result.entityId_ = entityId_; onBuilt(); return result; } @@ -528,14 +528,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify other) { if (other == emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExitFocusNotify.getDefaultInstance()) return this; - if (other.hasFinishForward()) { - mergeFinishForward(other.getFinishForward()); + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); } if (other.forwardType_ != 0) { setForwardTypeValue(other.getForwardTypeValue()); } - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); + if (other.hasFinishForward()) { + mergeFinishForward(other.getFinishForward()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -566,6 +566,91 @@ public Builder mergeFrom( return this; } + private int entityId_ ; + /** + * uint32 entity_id = 2; + * @return The entityId. + */ + @java.lang.Override + public int getEntityId() { + return entityId_; + } + /** + * uint32 entity_id = 2; + * @param value The entityId to set. + * @return This builder for chaining. + */ + public Builder setEntityId(int value) { + + entityId_ = value; + onChanged(); + return this; + } + /** + * uint32 entity_id = 2; + * @return This builder for chaining. + */ + public Builder clearEntityId() { + + entityId_ = 0; + onChanged(); + return this; + } + + private int forwardType_ = 0; + /** + * .ForwardType forward_type = 5; + * @return The enum numeric value on the wire for forwardType. + */ + @java.lang.Override public int getForwardTypeValue() { + return forwardType_; + } + /** + * .ForwardType forward_type = 5; + * @param value The enum numeric value on the wire for forwardType to set. + * @return This builder for chaining. + */ + public Builder setForwardTypeValue(int value) { + + forwardType_ = value; + onChanged(); + return this; + } + /** + * .ForwardType forward_type = 5; + * @return The forwardType. + */ + @java.lang.Override + public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType result = emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.valueOf(forwardType_); + return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result; + } + /** + * .ForwardType forward_type = 5; + * @param value The forwardType to set. + * @return This builder for chaining. + */ + public Builder setForwardType(emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType value) { + if (value == null) { + throw new NullPointerException(); + } + + forwardType_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .ForwardType forward_type = 5; + * @return This builder for chaining. + */ + public Builder clearForwardType() { + + forwardType_ = 0; + onChanged(); + return this; + } + private emu.grasscutter.net.proto.VectorOuterClass.Vector finishForward_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> finishForwardBuilder_; @@ -684,91 +769,6 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFinishForwa } return finishForwardBuilder_; } - - private int forwardType_ = 0; - /** - * .ForwardType forward_type = 12; - * @return The enum numeric value on the wire for forwardType. - */ - @java.lang.Override public int getForwardTypeValue() { - return forwardType_; - } - /** - * .ForwardType forward_type = 12; - * @param value The enum numeric value on the wire for forwardType to set. - * @return This builder for chaining. - */ - public Builder setForwardTypeValue(int value) { - - forwardType_ = value; - onChanged(); - return this; - } - /** - * .ForwardType forward_type = 12; - * @return The forwardType. - */ - @java.lang.Override - public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType result = emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.valueOf(forwardType_); - return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result; - } - /** - * .ForwardType forward_type = 12; - * @param value The forwardType to set. - * @return This builder for chaining. - */ - public Builder setForwardType(emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType value) { - if (value == null) { - throw new NullPointerException(); - } - - forwardType_ = value.getNumber(); - onChanged(); - return this; - } - /** - * .ForwardType forward_type = 12; - * @return This builder for chaining. - */ - public Builder clearForwardType() { - - forwardType_ = 0; - onChanged(); - return this; - } - - private int entityId_ ; - /** - * uint32 entity_id = 11; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - /** - * uint32 entity_id = 11; - * @param value The entityId to set. - * @return This builder for chaining. - */ - public Builder setEntityId(int value) { - - entityId_ = value; - onChanged(); - return this; - } - /** - * uint32 entity_id = 11; - * @return This builder for chaining. - */ - public Builder clearEntityId() { - - entityId_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -836,27 +836,27 @@ public emu.grasscutter.net.proto.EvtAvatarExitFocusNotifyOuterClass.EvtAvatarExi descriptor; static { java.lang.String[] descriptorData = { - "\n\036EvtAvatarExitFocusNotify.proto\032\014Vector" + - ".proto\032\021ForwardType.proto\"r\n\030EvtAvatarEx" + - "itFocusNotify\022\037\n\016finish_forward\030\r \001(\0132\007." + - "Vector\022\"\n\014forward_type\030\014 \001(\0162\014.ForwardTy" + - "pe\022\021\n\tentity_id\030\013 \001(\rB\033\n\031emu.grasscutter" + + "\n\036EvtAvatarExitFocusNotify.proto\032\021Forwar" + + "dType.proto\032\014Vector.proto\"r\n\030EvtAvatarEx" + + "itFocusNotify\022\021\n\tentity_id\030\002 \001(\r\022\"\n\014forw" + + "ard_type\030\005 \001(\0162\014.ForwardType\022\037\n\016finish_f" + + "orward\030\r \001(\0132\007.VectorB\033\n\031emu.grasscutter" + ".net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(), emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(), + emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(), }); internal_static_EvtAvatarExitFocusNotify_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_EvtAvatarExitFocusNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_EvtAvatarExitFocusNotify_descriptor, - new java.lang.String[] { "FinishForward", "ForwardType", "EntityId", }); - emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); + new java.lang.String[] { "EntityId", "ForwardType", "FinishForward", }); emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(); + emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarSitDownNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarSitDownNotifyOuterClass.java index ad2530d1372..eae091fe421 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarSitDownNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarSitDownNotifyOuterClass.java @@ -54,6 +54,7 @@ public interface EvtAvatarSitDownNotifyOrBuilder extends /** * 
    * CmdId: 22638
+   * obf: PBJDAJJGMNH
    *
* * Protobuf type {@code EvtAvatarSitDownNotify} @@ -416,6 +417,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 22638
+     * obf: PBJDAJJGMNH
      *
* * Protobuf type {@code EvtAvatarSitDownNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarUpdateFocusNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarUpdateFocusNotifyOuterClass.java index 6808be37709..a57797bb39d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarUpdateFocusNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarUpdateFocusNotifyOuterClass.java @@ -19,41 +19,40 @@ public interface EvtAvatarUpdateFocusNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 entity_id = 8; + * uint32 entity_id = 1; * @return The entityId. */ int getEntityId(); /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; * @return Whether the focusForward field is set. */ boolean hasFocusForward(); /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; * @return The focusForward. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getFocusForward(); /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwardOrBuilder(); /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @return The enum numeric value on the wire for forwardType. */ int getForwardTypeValue(); /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @return The forwardType. */ emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType(); } /** * 
-   * CmdId: 8305
-   * Obf: LHFNDLOOJKJ
+   * CmdId: 8696
    *
* * Protobuf type {@code EvtAvatarUpdateFocusNotify} @@ -101,18 +100,12 @@ private EvtAvatarUpdateFocusNotify( case 0: done = true; break; - case 64: { + case 8: { entityId_ = input.readUInt32(); break; } - case 72: { - int rawValue = input.readEnum(); - - forwardType_ = rawValue; - break; - } - case 114: { + case 58: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (focusForward_ != null) { subBuilder = focusForward_.toBuilder(); @@ -125,6 +118,12 @@ private EvtAvatarUpdateFocusNotify( break; } + case 104: { + int rawValue = input.readEnum(); + + forwardType_ = rawValue; + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -157,10 +156,10 @@ private EvtAvatarUpdateFocusNotify( emu.grasscutter.net.proto.EvtAvatarUpdateFocusNotifyOuterClass.EvtAvatarUpdateFocusNotify.class, emu.grasscutter.net.proto.EvtAvatarUpdateFocusNotifyOuterClass.EvtAvatarUpdateFocusNotify.Builder.class); } - public static final int ENTITY_ID_FIELD_NUMBER = 8; + public static final int ENTITY_ID_FIELD_NUMBER = 1; private int entityId_; /** - * uint32 entity_id = 8; + * uint32 entity_id = 1; * @return The entityId. */ @java.lang.Override @@ -168,10 +167,10 @@ public int getEntityId() { return entityId_; } - public static final int FOCUS_FORWARD_FIELD_NUMBER = 14; + public static final int FOCUS_FORWARD_FIELD_NUMBER = 7; private emu.grasscutter.net.proto.VectorOuterClass.Vector focusForward_; /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; * @return Whether the focusForward field is set. */ @java.lang.Override @@ -179,7 +178,7 @@ public boolean hasFocusForward() { return focusForward_ != null; } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; * @return The focusForward. */ @java.lang.Override @@ -187,24 +186,24 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getFocusForward() { return focusForward_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : focusForward_; } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwardOrBuilder() { return getFocusForward(); } - public static final int FORWARD_TYPE_FIELD_NUMBER = 9; + public static final int FORWARD_TYPE_FIELD_NUMBER = 13; private int forwardType_; /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @return The enum numeric value on the wire for forwardType. */ @java.lang.Override public int getForwardTypeValue() { return forwardType_; } /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @return The forwardType. */ @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() { @@ -228,13 +227,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (entityId_ != 0) { - output.writeUInt32(8, entityId_); - } - if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { - output.writeEnum(9, forwardType_); + output.writeUInt32(1, entityId_); } if (focusForward_ != null) { - output.writeMessage(14, getFocusForward()); + output.writeMessage(7, getFocusForward()); + } + if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { + output.writeEnum(13, forwardType_); } unknownFields.writeTo(output); } @@ -247,15 +246,15 @@ public int getSerializedSize() { size = 0; if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, entityId_); + .computeUInt32Size(1, entityId_); } - if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { + if (focusForward_ != null) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(9, forwardType_); + .computeMessageSize(7, getFocusForward()); } - if (focusForward_ != null) { + if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, getFocusForward()); + .computeEnumSize(13, forwardType_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -396,8 +395,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 8305
-     * Obf: LHFNDLOOJKJ
+     * CmdId: 8696
      *
* * Protobuf type {@code EvtAvatarUpdateFocusNotify} @@ -568,7 +566,7 @@ public Builder mergeFrom( private int entityId_ ; /** - * uint32 entity_id = 8; + * uint32 entity_id = 1; * @return The entityId. */ @java.lang.Override @@ -576,7 +574,7 @@ public int getEntityId() { return entityId_; } /** - * uint32 entity_id = 8; + * uint32 entity_id = 1; * @param value The entityId to set. * @return This builder for chaining. */ @@ -587,7 +585,7 @@ public Builder setEntityId(int value) { return this; } /** - * uint32 entity_id = 8; + * uint32 entity_id = 1; * @return This builder for chaining. */ public Builder clearEntityId() { @@ -601,14 +599,14 @@ public Builder clearEntityId() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> focusForwardBuilder_; /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; * @return Whether the focusForward field is set. */ public boolean hasFocusForward() { return focusForwardBuilder_ != null || focusForward_ != null; } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; * @return The focusForward. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getFocusForward() { @@ -619,7 +617,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getFocusForward() { } } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ public Builder setFocusForward(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (focusForwardBuilder_ == null) { @@ -635,7 +633,7 @@ public Builder setFocusForward(emu.grasscutter.net.proto.VectorOuterClass.Vector return this; } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ public Builder setFocusForward( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -649,7 +647,7 @@ public Builder setFocusForward( return this; } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ public Builder mergeFocusForward(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (focusForwardBuilder_ == null) { @@ -667,7 +665,7 @@ public Builder mergeFocusForward(emu.grasscutter.net.proto.VectorOuterClass.Vect return this; } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ public Builder clearFocusForward() { if (focusForwardBuilder_ == null) { @@ -681,7 +679,7 @@ public Builder clearFocusForward() { return this; } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getFocusForwardBuilder() { @@ -689,7 +687,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getFocusForward return getFocusForwardFieldBuilder().getBuilder(); } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwardOrBuilder() { if (focusForwardBuilder_ != null) { @@ -700,7 +698,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwar } } /** - * .Vector focus_forward = 14; + * .Vector focus_forward = 7; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -718,14 +716,14 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getFocusForwar private int forwardType_ = 0; /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @return The enum numeric value on the wire for forwardType. */ @java.lang.Override public int getForwardTypeValue() { return forwardType_; } /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @param value The enum numeric value on the wire for forwardType to set. * @return This builder for chaining. */ @@ -736,7 +734,7 @@ public Builder setForwardTypeValue(int value) { return this; } /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @return The forwardType. */ @java.lang.Override @@ -746,7 +744,7 @@ public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardTyp return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result; } /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @param value The forwardType to set. * @return This builder for chaining. */ @@ -760,7 +758,7 @@ public Builder setForwardType(emu.grasscutter.net.proto.ForwardTypeOuterClass.Fo return this; } /** - * .ForwardType forward_type = 9; + * .ForwardType forward_type = 13; * @return This builder for chaining. */ public Builder clearForwardType() { @@ -838,9 +836,9 @@ public emu.grasscutter.net.proto.EvtAvatarUpdateFocusNotifyOuterClass.EvtAvatarU java.lang.String[] descriptorData = { "\n EvtAvatarUpdateFocusNotify.proto\032\014Vect" + "or.proto\032\021ForwardType.proto\"s\n\032EvtAvatar" + - "UpdateFocusNotify\022\021\n\tentity_id\030\010 \001(\r\022\036\n\r" + - "focus_forward\030\016 \001(\0132\007.Vector\022\"\n\014forward_" + - "type\030\t \001(\0162\014.ForwardTypeB\033\n\031emu.grasscut" + + "UpdateFocusNotify\022\021\n\tentity_id\030\001 \001(\r\022\036\n\r" + + "focus_forward\030\007 \001(\0132\007.Vector\022\"\n\014forward_" + + "type\030\r \001(\0162\014.ForwardTypeB\033\n\031emu.grasscut" + "ter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityRenderersChangedNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityRenderersChangedNotifyOuterClass.java index d637437d5b8..f378be8f585 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityRenderersChangedNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityRenderersChangedNotifyOuterClass.java @@ -59,6 +59,7 @@ public interface EvtEntityRenderersChangedNotifyOrBuilder extends /** * 
    * CmdId: 7358
+   * obf: HCNBKIBKGAG
    *
* * Protobuf type {@code EvtEntityRenderersChangedNotify} @@ -430,6 +431,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 7358
+     * obf: HCNBKIBKGAG
      *
* * Protobuf type {@code EvtEntityRenderersChangedNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ExecuteGadgetLuaReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ExecuteGadgetLuaReqOuterClass.java index 823e32b83e5..68d12c9c73c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ExecuteGadgetLuaReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ExecuteGadgetLuaReqOuterClass.java @@ -19,33 +19,33 @@ public interface ExecuteGadgetLuaReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 param1 = 2; - * @return The param1. + * int32 param3 = 10; + * @return The param3. */ - int getParam1(); + int getParam3(); /** - * int32 param3 = 5; - * @return The param3. + * int32 param2 = 7; + * @return The param2. */ - int getParam3(); + int getParam2(); /** - * uint32 source_entity_id = 10; - * @return The sourceEntityId. + * int32 param1 = 1; + * @return The param1. */ - int getSourceEntityId(); + int getParam1(); /** - * int32 param2 = 8; - * @return The param2. + * uint32 source_entity_id = 6; + * @return The sourceEntityId. */ - int getParam2(); + int getSourceEntityId(); } /** * 
-   * CmdId: 5288
-   * Obf: BCCHIHOEMNP
+   * CmdId: 5759
+   * obf: JCNCIIDJLIF
    *
* * Protobuf type {@code ExecuteGadgetLuaReq} @@ -92,24 +92,24 @@ private ExecuteGadgetLuaReq( case 0: done = true; break; - case 16: { + case 8: { param1_ = input.readInt32(); break; } - case 40: { + case 48: { - param3_ = input.readInt32(); + sourceEntityId_ = input.readUInt32(); break; } - case 64: { + case 56: { param2_ = input.readInt32(); break; } case 80: { - sourceEntityId_ = input.readUInt32(); + param3_ = input.readInt32(); break; } default: { @@ -144,48 +144,48 @@ private ExecuteGadgetLuaReq( emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq.class, emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq.Builder.class); } - public static final int PARAM1_FIELD_NUMBER = 2; - private int param1_; + public static final int PARAM3_FIELD_NUMBER = 10; + private int param3_; /** - * int32 param1 = 2; - * @return The param1. + * int32 param3 = 10; + * @return The param3. */ @java.lang.Override - public int getParam1() { - return param1_; + public int getParam3() { + return param3_; } - public static final int PARAM3_FIELD_NUMBER = 5; - private int param3_; + public static final int PARAM2_FIELD_NUMBER = 7; + private int param2_; /** - * int32 param3 = 5; - * @return The param3. + * int32 param2 = 7; + * @return The param2. */ @java.lang.Override - public int getParam3() { - return param3_; + public int getParam2() { + return param2_; } - public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 10; - private int sourceEntityId_; + public static final int PARAM1_FIELD_NUMBER = 1; + private int param1_; /** - * uint32 source_entity_id = 10; - * @return The sourceEntityId. + * int32 param1 = 1; + * @return The param1. */ @java.lang.Override - public int getSourceEntityId() { - return sourceEntityId_; + public int getParam1() { + return param1_; } - public static final int PARAM2_FIELD_NUMBER = 8; - private int param2_; + public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 6; + private int sourceEntityId_; /** - * int32 param2 = 8; - * @return The param2. + * uint32 source_entity_id = 6; + * @return The sourceEntityId. */ @java.lang.Override - public int getParam2() { - return param2_; + public int getSourceEntityId() { + return sourceEntityId_; } private byte memoizedIsInitialized = -1; @@ -203,16 +203,16 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (param1_ != 0) { - output.writeInt32(2, param1_); + output.writeInt32(1, param1_); } - if (param3_ != 0) { - output.writeInt32(5, param3_); + if (sourceEntityId_ != 0) { + output.writeUInt32(6, sourceEntityId_); } if (param2_ != 0) { - output.writeInt32(8, param2_); + output.writeInt32(7, param2_); } - if (sourceEntityId_ != 0) { - output.writeUInt32(10, sourceEntityId_); + if (param3_ != 0) { + output.writeInt32(10, param3_); } unknownFields.writeTo(output); } @@ -225,19 +225,19 @@ public int getSerializedSize() { size = 0; if (param1_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, param1_); + .computeInt32Size(1, param1_); } - if (param3_ != 0) { + if (sourceEntityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, param3_); + .computeUInt32Size(6, sourceEntityId_); } if (param2_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(8, param2_); + .computeInt32Size(7, param2_); } - if (sourceEntityId_ != 0) { + if (param3_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, sourceEntityId_); + .computeInt32Size(10, param3_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -254,14 +254,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq other = (emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq) obj; - if (getParam1() - != other.getParam1()) return false; if (getParam3() != other.getParam3()) return false; - if (getSourceEntityId() - != other.getSourceEntityId()) return false; if (getParam2() != other.getParam2()) return false; + if (getParam1() + != other.getParam1()) return false; + if (getSourceEntityId() + != other.getSourceEntityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -273,14 +273,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PARAM1_FIELD_NUMBER; - hash = (53 * hash) + getParam1(); hash = (37 * hash) + PARAM3_FIELD_NUMBER; hash = (53 * hash) + getParam3(); - hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getSourceEntityId(); hash = (37 * hash) + PARAM2_FIELD_NUMBER; hash = (53 * hash) + getParam2(); + hash = (37 * hash) + PARAM1_FIELD_NUMBER; + hash = (53 * hash) + getParam1(); + hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getSourceEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -378,8 +378,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5288
-     * Obf: BCCHIHOEMNP
+     * CmdId: 5759
+     * obf: JCNCIIDJLIF
      *
* * Protobuf type {@code ExecuteGadgetLuaReq} @@ -419,14 +419,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - param1_ = 0; - param3_ = 0; - sourceEntityId_ = 0; - param2_ = 0; + param1_ = 0; + + sourceEntityId_ = 0; + return this; } @@ -453,10 +453,10 @@ public emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaR @java.lang.Override public emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq buildPartial() { emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq result = new emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq(this); - result.param1_ = param1_; result.param3_ = param3_; - result.sourceEntityId_ = sourceEntityId_; result.param2_ = param2_; + result.param1_ = param1_; + result.sourceEntityId_ = sourceEntityId_; onBuilt(); return result; } @@ -505,18 +505,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq other) { if (other == emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaReq.getDefaultInstance()) return this; - if (other.getParam1() != 0) { - setParam1(other.getParam1()); - } if (other.getParam3() != 0) { setParam3(other.getParam3()); } - if (other.getSourceEntityId() != 0) { - setSourceEntityId(other.getSourceEntityId()); - } if (other.getParam2() != 0) { setParam2(other.getParam2()); } + if (other.getParam1() != 0) { + setParam1(other.getParam1()); + } + if (other.getSourceEntityId() != 0) { + setSourceEntityId(other.getSourceEntityId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -546,126 +546,126 @@ public Builder mergeFrom( return this; } - private int param1_ ; + private int param3_ ; /** - * int32 param1 = 2; - * @return The param1. + * int32 param3 = 10; + * @return The param3. */ @java.lang.Override - public int getParam1() { - return param1_; + public int getParam3() { + return param3_; } /** - * int32 param1 = 2; - * @param value The param1 to set. + * int32 param3 = 10; + * @param value The param3 to set. * @return This builder for chaining. */ - public Builder setParam1(int value) { + public Builder setParam3(int value) { - param1_ = value; + param3_ = value; onChanged(); return this; } /** - * int32 param1 = 2; + * int32 param3 = 10; * @return This builder for chaining. */ - public Builder clearParam1() { + public Builder clearParam3() { - param1_ = 0; + param3_ = 0; onChanged(); return this; } - private int param3_ ; + private int param2_ ; /** - * int32 param3 = 5; - * @return The param3. + * int32 param2 = 7; + * @return The param2. */ @java.lang.Override - public int getParam3() { - return param3_; + public int getParam2() { + return param2_; } /** - * int32 param3 = 5; - * @param value The param3 to set. + * int32 param2 = 7; + * @param value The param2 to set. * @return This builder for chaining. */ - public Builder setParam3(int value) { + public Builder setParam2(int value) { - param3_ = value; + param2_ = value; onChanged(); return this; } /** - * int32 param3 = 5; + * int32 param2 = 7; * @return This builder for chaining. */ - public Builder clearParam3() { + public Builder clearParam2() { - param3_ = 0; + param2_ = 0; onChanged(); return this; } - private int sourceEntityId_ ; + private int param1_ ; /** - * uint32 source_entity_id = 10; - * @return The sourceEntityId. + * int32 param1 = 1; + * @return The param1. */ @java.lang.Override - public int getSourceEntityId() { - return sourceEntityId_; + public int getParam1() { + return param1_; } /** - * uint32 source_entity_id = 10; - * @param value The sourceEntityId to set. + * int32 param1 = 1; + * @param value The param1 to set. * @return This builder for chaining. */ - public Builder setSourceEntityId(int value) { + public Builder setParam1(int value) { - sourceEntityId_ = value; + param1_ = value; onChanged(); return this; } /** - * uint32 source_entity_id = 10; + * int32 param1 = 1; * @return This builder for chaining. */ - public Builder clearSourceEntityId() { + public Builder clearParam1() { - sourceEntityId_ = 0; + param1_ = 0; onChanged(); return this; } - private int param2_ ; + private int sourceEntityId_ ; /** - * int32 param2 = 8; - * @return The param2. + * uint32 source_entity_id = 6; + * @return The sourceEntityId. */ @java.lang.Override - public int getParam2() { - return param2_; + public int getSourceEntityId() { + return sourceEntityId_; } /** - * int32 param2 = 8; - * @param value The param2 to set. + * uint32 source_entity_id = 6; + * @param value The sourceEntityId to set. * @return This builder for chaining. */ - public Builder setParam2(int value) { + public Builder setSourceEntityId(int value) { - param2_ = value; + sourceEntityId_ = value; onChanged(); return this; } /** - * int32 param2 = 8; + * uint32 source_entity_id = 6; * @return This builder for chaining. */ - public Builder clearParam2() { + public Builder clearSourceEntityId() { - param2_ = 0; + sourceEntityId_ = 0; onChanged(); return this; } @@ -737,9 +737,9 @@ public emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaR static { java.lang.String[] descriptorData = { "\n\031ExecuteGadgetLuaReq.proto\"_\n\023ExecuteGa" + - "dgetLuaReq\022\016\n\006param1\030\002 \001(\005\022\016\n\006param3\030\005 \001" + - "(\005\022\030\n\020source_entity_id\030\n \001(\r\022\016\n\006param2\030\010" + - " \001(\005B\033\n\031emu.grasscutter.net.protob\006proto" + + "dgetLuaReq\022\016\n\006param3\030\n \001(\005\022\016\n\006param2\030\007 \001" + + "(\005\022\016\n\006param1\030\001 \001(\005\022\030\n\020source_entity_id\030\006" + + " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" + "3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -751,7 +751,7 @@ public emu.grasscutter.net.proto.ExecuteGadgetLuaReqOuterClass.ExecuteGadgetLuaR internal_static_ExecuteGadgetLuaReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ExecuteGadgetLuaReq_descriptor, - new java.lang.String[] { "Param1", "Param3", "SourceEntityId", "Param2", }); + new java.lang.String[] { "Param3", "Param2", "Param1", "SourceEntityId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ExitTransPointRegionNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ExitTransPointRegionNotifyOuterClass.java index 277fac456be..8cfdec4d842 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ExitTransPointRegionNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ExitTransPointRegionNotifyOuterClass.java @@ -19,21 +19,22 @@ public interface ExitTransPointRegionNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 point_id = 8; - * @return The pointId. + * uint32 scene_id = 9; + * @return The sceneId. */ - int getPointId(); + int getSceneId(); /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 point_id = 13; + * @return The pointId. */ - int getSceneId(); + int getPointId(); } /** * 
-   * CmdId: 2696
-   * Obf: BBGPGHPCHGN
+   * CmdId: 27579
+   * obf: DMNDPEJAEDI
+   * 5.0
    *
* * Protobuf type {@code ExitTransPointRegionNotify} @@ -80,14 +81,14 @@ private ExitTransPointRegionNotify( case 0: done = true; break; - case 64: { + case 72: { - pointId_ = input.readUInt32(); + sceneId_ = input.readUInt32(); break; } - case 96: { + case 104: { - sceneId_ = input.readUInt32(); + pointId_ = input.readUInt32(); break; } default: { @@ -122,26 +123,26 @@ private ExitTransPointRegionNotify( emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify.class, emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify.Builder.class); } - public static final int POINT_ID_FIELD_NUMBER = 8; - private int pointId_; + public static final int SCENE_ID_FIELD_NUMBER = 9; + private int sceneId_; /** - * uint32 point_id = 8; - * @return The pointId. + * uint32 scene_id = 9; + * @return The sceneId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getSceneId() { + return sceneId_; } - public static final int SCENE_ID_FIELD_NUMBER = 12; - private int sceneId_; + public static final int POINT_ID_FIELD_NUMBER = 13; + private int pointId_; /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 point_id = 13; + * @return The pointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointId() { + return pointId_; } private byte memoizedIsInitialized = -1; @@ -158,11 +159,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (pointId_ != 0) { - output.writeUInt32(8, pointId_); - } if (sceneId_ != 0) { - output.writeUInt32(12, sceneId_); + output.writeUInt32(9, sceneId_); + } + if (pointId_ != 0) { + output.writeUInt32(13, pointId_); } unknownFields.writeTo(output); } @@ -173,13 +174,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (pointId_ != 0) { + if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, pointId_); + .computeUInt32Size(9, sceneId_); } - if (sceneId_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, sceneId_); + .computeUInt32Size(13, pointId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +197,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify other = (emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify) obj; - if (getPointId() - != other.getPointId()) return false; if (getSceneId() != other.getSceneId()) return false; + if (getPointId() + != other.getPointId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +212,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + POINT_ID_FIELD_NUMBER; - hash = (53 * hash) + getPointId(); hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); + hash = (37 * hash) + POINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getPointId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +313,9 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2696
-     * Obf: BBGPGHPCHGN
+     * CmdId: 27579
+     * obf: DMNDPEJAEDI
+     * 5.0
      *
* * Protobuf type {@code ExitTransPointRegionNotify} @@ -353,10 +355,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pointId_ = 0; - sceneId_ = 0; + pointId_ = 0; + return this; } @@ -383,8 +385,8 @@ public emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransP @java.lang.Override public emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify buildPartial() { emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify result = new emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify(this); - result.pointId_ = pointId_; result.sceneId_ = sceneId_; + result.pointId_ = pointId_; onBuilt(); return result; } @@ -433,12 +435,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify other) { if (other == emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransPointRegionNotify.getDefaultInstance()) return this; - if (other.getPointId() != 0) { - setPointId(other.getPointId()); - } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } + if (other.getPointId() != 0) { + setPointId(other.getPointId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +470,64 @@ public Builder mergeFrom( return this; } - private int pointId_ ; + private int sceneId_ ; /** - * uint32 point_id = 8; - * @return The pointId. + * uint32 scene_id = 9; + * @return The sceneId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 point_id = 8; - * @param value The pointId to set. + * uint32 scene_id = 9; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setPointId(int value) { + public Builder setSceneId(int value) { - pointId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 point_id = 8; + * uint32 scene_id = 9; * @return This builder for chaining. */ - public Builder clearPointId() { + public Builder clearSceneId() { - pointId_ = 0; + sceneId_ = 0; onChanged(); return this; } - private int sceneId_ ; + private int pointId_ ; /** - * uint32 scene_id = 12; - * @return The sceneId. + * uint32 point_id = 13; + * @return The pointId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getPointId() { + return pointId_; } /** - * uint32 scene_id = 12; - * @param value The sceneId to set. + * uint32 point_id = 13; + * @param value The pointId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setPointId(int value) { - sceneId_ = value; + pointId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 12; + * uint32 point_id = 13; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearPointId() { - sceneId_ = 0; + pointId_ = 0; onChanged(); return this; } @@ -597,8 +599,8 @@ public emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransP static { java.lang.String[] descriptorData = { "\n ExitTransPointRegionNotify.proto\"@\n\032Ex" + - "itTransPointRegionNotify\022\020\n\010point_id\030\010 \001" + - "(\r\022\020\n\010scene_id\030\014 \001(\rB\033\n\031emu.grasscutter." + + "itTransPointRegionNotify\022\020\n\010scene_id\030\t \001" + + "(\r\022\020\n\010point_id\030\r \001(\rB\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +612,7 @@ public emu.grasscutter.net.proto.ExitTransPointRegionNotifyOuterClass.ExitTransP internal_static_ExitTransPointRegionNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ExitTransPointRegionNotify_descriptor, - new java.lang.String[] { "PointId", "SceneId", }); + new java.lang.String[] { "SceneId", "PointId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeDataNotifyOuterClass.java index 4dd89b0b61b..4044b6f3bbc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeDataNotifyOuterClass.java @@ -19,11 +19,17 @@ public interface ForgeDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * uint32 max_queue_num = 2; + * @return The maxQueueNum. + */ + int getMaxQueueNum(); + + /** + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ int getForgeQueueMapCount(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ boolean containsForgeQueueMap( int key); @@ -34,42 +40,36 @@ boolean containsForgeQueueMap( java.util.Map getForgeQueueMap(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ java.util.Map getForgeQueueMapMap(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForgeQueueMapOrDefault( int key, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData defaultValue); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForgeQueueMapOrThrow( int key); /** - * uint32 max_queue_num = 9; - * @return The maxQueueNum. - */ - int getMaxQueueNum(); - - /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @return A list containing the forgeIdList. */ java.util.List getForgeIdListList(); /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @return The count of forgeIdList. */ int getForgeIdListCount(); /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @param index The index of the element to return. * @return The forgeIdList at the given index. */ @@ -77,8 +77,8 @@ emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForgeQueueM } /** * 
-   * CmdId: 6813
-   * Obf: BFIGHNIEAFO
+   * CmdId: 20023
+   * obf: GAINABOLNJD
    *
* * Protobuf type {@code ForgeDataNotify} @@ -127,7 +127,25 @@ private ForgeDataNotify( case 0: done = true; break; - case 32: { + case 16: { + + maxQueueNum_ = input.readUInt32(); + break; + } + case 66: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + forgeQueueMap_ = com.google.protobuf.MapField.newMapField( + ForgeQueueMapDefaultEntryHolder.defaultEntry); + mutable_bitField0_ |= 0x00000001; + } + com.google.protobuf.MapEntry + forgeQueueMap__ = input.readMessage( + ForgeQueueMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + forgeQueueMap_.getMutableMap().put( + forgeQueueMap__.getKey(), forgeQueueMap__.getValue()); + break; + } + case 96: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { forgeIdList_ = newIntList(); mutable_bitField0_ |= 0x00000002; @@ -135,7 +153,7 @@ private ForgeDataNotify( forgeIdList_.addInt(input.readUInt32()); break; } - case 34: { + case 98: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { @@ -148,24 +166,6 @@ private ForgeDataNotify( input.popLimit(limit); break; } - case 58: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - forgeQueueMap_ = com.google.protobuf.MapField.newMapField( - ForgeQueueMapDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry - forgeQueueMap__ = input.readMessage( - ForgeQueueMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - forgeQueueMap_.getMutableMap().put( - forgeQueueMap__.getKey(), forgeQueueMap__.getValue()); - break; - } - case 72: { - - maxQueueNum_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -198,7 +198,7 @@ private ForgeDataNotify( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 7: + case 8: return internalGetForgeQueueMap(); default: throw new RuntimeException( @@ -213,7 +213,18 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify.class, emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify.Builder.class); } - public static final int FORGE_QUEUE_MAP_FIELD_NUMBER = 7; + public static final int MAX_QUEUE_NUM_FIELD_NUMBER = 2; + private int maxQueueNum_; + /** + * uint32 max_queue_num = 2; + * @return The maxQueueNum. + */ + @java.lang.Override + public int getMaxQueueNum() { + return maxQueueNum_; + } + + public static final int FORGE_QUEUE_MAP_FIELD_NUMBER = 8; private static final class ForgeQueueMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData> defaultEntry = @@ -240,7 +251,7 @@ public int getForgeQueueMapCount() { return internalGetForgeQueueMap().getMap().size(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ @java.lang.Override @@ -258,7 +269,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ @java.lang.Override @@ -266,7 +277,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ @java.lang.Override @@ -279,7 +290,7 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ @java.lang.Override @@ -294,21 +305,10 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.get(key); } - public static final int MAX_QUEUE_NUM_FIELD_NUMBER = 9; - private int maxQueueNum_; - /** - * uint32 max_queue_num = 9; - * @return The maxQueueNum. - */ - @java.lang.Override - public int getMaxQueueNum() { - return maxQueueNum_; - } - - public static final int FORGE_ID_LIST_FIELD_NUMBER = 4; + public static final int FORGE_ID_LIST_FIELD_NUMBER = 12; private com.google.protobuf.Internal.IntList forgeIdList_; /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @return A list containing the forgeIdList. */ @java.lang.Override @@ -317,14 +317,14 @@ public int getMaxQueueNum() { return forgeIdList_; } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @return The count of forgeIdList. */ public int getForgeIdListCount() { return forgeIdList_.size(); } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @param index The index of the element to return. * @return The forgeIdList at the given index. */ @@ -348,21 +348,21 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (getForgeIdListList().size() > 0) { - output.writeUInt32NoTag(34); - output.writeUInt32NoTag(forgeIdListMemoizedSerializedSize); - } - for (int i = 0; i < forgeIdList_.size(); i++) { - output.writeUInt32NoTag(forgeIdList_.getInt(i)); + if (maxQueueNum_ != 0) { + output.writeUInt32(2, maxQueueNum_); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetForgeQueueMap(), ForgeQueueMapDefaultEntryHolder.defaultEntry, - 7); - if (maxQueueNum_ != 0) { - output.writeUInt32(9, maxQueueNum_); + 8); + if (getForgeIdListList().size() > 0) { + output.writeUInt32NoTag(98); + output.writeUInt32NoTag(forgeIdListMemoizedSerializedSize); + } + for (int i = 0; i < forgeIdList_.size(); i++) { + output.writeUInt32NoTag(forgeIdList_.getInt(i)); } unknownFields.writeTo(output); } @@ -373,6 +373,20 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (maxQueueNum_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(2, maxQueueNum_); + } + for (java.util.Map.Entry entry + : internalGetForgeQueueMap().getMap().entrySet()) { + com.google.protobuf.MapEntry + forgeQueueMap__ = ForgeQueueMapDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, forgeQueueMap__); + } { int dataSize = 0; for (int i = 0; i < forgeIdList_.size(); i++) { @@ -387,20 +401,6 @@ public int getSerializedSize() { } forgeIdListMemoizedSerializedSize = dataSize; } - for (java.util.Map.Entry entry - : internalGetForgeQueueMap().getMap().entrySet()) { - com.google.protobuf.MapEntry - forgeQueueMap__ = ForgeQueueMapDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, forgeQueueMap__); - } - if (maxQueueNum_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, maxQueueNum_); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -416,10 +416,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify other = (emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify) obj; - if (!internalGetForgeQueueMap().equals( - other.internalGetForgeQueueMap())) return false; if (getMaxQueueNum() != other.getMaxQueueNum()) return false; + if (!internalGetForgeQueueMap().equals( + other.internalGetForgeQueueMap())) return false; if (!getForgeIdListList() .equals(other.getForgeIdListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -433,12 +433,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MAX_QUEUE_NUM_FIELD_NUMBER; + hash = (53 * hash) + getMaxQueueNum(); if (!internalGetForgeQueueMap().getMap().isEmpty()) { hash = (37 * hash) + FORGE_QUEUE_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetForgeQueueMap().hashCode(); } - hash = (37 * hash) + MAX_QUEUE_NUM_FIELD_NUMBER; - hash = (53 * hash) + getMaxQueueNum(); if (getForgeIdListCount() > 0) { hash = (37 * hash) + FORGE_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getForgeIdListList().hashCode(); @@ -540,8 +540,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 6813
-     * Obf: BFIGHNIEAFO
+     * CmdId: 20023
+     * obf: GAINABOLNJD
      *
* * Protobuf type {@code ForgeDataNotify} @@ -559,7 +559,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 7: + case 8: return internalGetForgeQueueMap(); default: throw new RuntimeException( @@ -570,7 +570,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 7: + case 8: return internalGetMutableForgeQueueMap(); default: throw new RuntimeException( @@ -603,9 +603,9 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - internalGetMutableForgeQueueMap().clear(); maxQueueNum_ = 0; + internalGetMutableForgeQueueMap().clear(); forgeIdList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); return this; @@ -635,9 +635,9 @@ public emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify build public emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify buildPartial() { emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify result = new emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify(this); int from_bitField0_ = bitField0_; + result.maxQueueNum_ = maxQueueNum_; result.forgeQueueMap_ = internalGetForgeQueueMap(); result.forgeQueueMap_.makeImmutable(); - result.maxQueueNum_ = maxQueueNum_; if (((bitField0_ & 0x00000002) != 0)) { forgeIdList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); @@ -691,11 +691,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify other) { if (other == emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify.getDefaultInstance()) return this; - internalGetMutableForgeQueueMap().mergeFrom( - other.internalGetForgeQueueMap()); if (other.getMaxQueueNum() != 0) { setMaxQueueNum(other.getMaxQueueNum()); } + internalGetMutableForgeQueueMap().mergeFrom( + other.internalGetForgeQueueMap()); if (!other.forgeIdList_.isEmpty()) { if (forgeIdList_.isEmpty()) { forgeIdList_ = other.forgeIdList_; @@ -736,6 +736,37 @@ public Builder mergeFrom( } private int bitField0_; + private int maxQueueNum_ ; + /** + * uint32 max_queue_num = 2; + * @return The maxQueueNum. + */ + @java.lang.Override + public int getMaxQueueNum() { + return maxQueueNum_; + } + /** + * uint32 max_queue_num = 2; + * @param value The maxQueueNum to set. + * @return This builder for chaining. + */ + public Builder setMaxQueueNum(int value) { + + maxQueueNum_ = value; + onChanged(); + return this; + } + /** + * uint32 max_queue_num = 2; + * @return This builder for chaining. + */ + public Builder clearMaxQueueNum() { + + maxQueueNum_ = 0; + onChanged(); + return this; + } + private com.google.protobuf.MapField< java.lang.Integer, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData> forgeQueueMap_; private com.google.protobuf.MapField @@ -763,7 +794,7 @@ public int getForgeQueueMapCount() { return internalGetForgeQueueMap().getMap().size(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ @java.lang.Override @@ -781,7 +812,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ @java.lang.Override @@ -789,7 +820,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ @java.lang.Override @@ -802,7 +833,7 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ @java.lang.Override @@ -823,7 +854,7 @@ public Builder clearForgeQueueMap() { return this; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ public Builder removeForgeQueueMap( @@ -842,7 +873,7 @@ public Builder removeForgeQueueMap( return internalGetMutableForgeQueueMap().getMutableMap(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ public Builder putForgeQueueMap( int key, @@ -854,7 +885,7 @@ public Builder putForgeQueueMap( return this; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 7; + * map<uint32, .ForgeQueueData> forge_queue_map = 8; */ public Builder putAllForgeQueueMap( @@ -864,37 +895,6 @@ public Builder putAllForgeQueueMap( return this; } - private int maxQueueNum_ ; - /** - * uint32 max_queue_num = 9; - * @return The maxQueueNum. - */ - @java.lang.Override - public int getMaxQueueNum() { - return maxQueueNum_; - } - /** - * uint32 max_queue_num = 9; - * @param value The maxQueueNum to set. - * @return This builder for chaining. - */ - public Builder setMaxQueueNum(int value) { - - maxQueueNum_ = value; - onChanged(); - return this; - } - /** - * uint32 max_queue_num = 9; - * @return This builder for chaining. - */ - public Builder clearMaxQueueNum() { - - maxQueueNum_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.Internal.IntList forgeIdList_ = emptyIntList(); private void ensureForgeIdListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { @@ -903,7 +903,7 @@ private void ensureForgeIdListIsMutable() { } } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @return A list containing the forgeIdList. */ public java.util.List @@ -912,14 +912,14 @@ private void ensureForgeIdListIsMutable() { java.util.Collections.unmodifiableList(forgeIdList_) : forgeIdList_; } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @return The count of forgeIdList. */ public int getForgeIdListCount() { return forgeIdList_.size(); } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @param index The index of the element to return. * @return The forgeIdList at the given index. */ @@ -927,7 +927,7 @@ public int getForgeIdList(int index) { return forgeIdList_.getInt(index); } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @param index The index to set the value at. * @param value The forgeIdList to set. * @return This builder for chaining. @@ -940,7 +940,7 @@ public Builder setForgeIdList( return this; } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @param value The forgeIdList to add. * @return This builder for chaining. */ @@ -951,7 +951,7 @@ public Builder addForgeIdList(int value) { return this; } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @param values The forgeIdList to add. * @return This builder for chaining. */ @@ -964,7 +964,7 @@ public Builder addAllForgeIdList( return this; } /** - * repeated uint32 forge_id_list = 4; + * repeated uint32 forge_id_list = 12; * @return This builder for chaining. */ public Builder clearForgeIdList() { @@ -1046,10 +1046,10 @@ public emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify getDe static { java.lang.String[] descriptorData = { "\n\025ForgeDataNotify.proto\032\024ForgeQueueData." + - "proto\"\304\001\n\017ForgeDataNotify\022<\n\017forge_queue" + - "_map\030\007 \003(\0132#.ForgeDataNotify.ForgeQueueM" + - "apEntry\022\025\n\rmax_queue_num\030\t \001(\r\022\025\n\rforge_" + - "id_list\030\004 \003(\r\032E\n\022ForgeQueueMapEntry\022\013\n\003k" + + "proto\"\304\001\n\017ForgeDataNotify\022\025\n\rmax_queue_n" + + "um\030\002 \001(\r\022<\n\017forge_queue_map\030\010 \003(\0132#.Forg" + + "eDataNotify.ForgeQueueMapEntry\022\025\n\rforge_" + + "id_list\030\014 \003(\r\032E\n\022ForgeQueueMapEntry\022\013\n\003k" + "ey\030\001 \001(\r\022\036\n\005value\030\002 \001(\0132\017.ForgeQueueData" + ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" + "3" @@ -1064,7 +1064,7 @@ public emu.grasscutter.net.proto.ForgeDataNotifyOuterClass.ForgeDataNotify getDe internal_static_ForgeDataNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ForgeDataNotify_descriptor, - new java.lang.String[] { "ForgeQueueMap", "MaxQueueNum", "ForgeIdList", }); + new java.lang.String[] { "MaxQueueNum", "ForgeQueueMap", "ForgeIdList", }); internal_static_ForgeDataNotify_ForgeQueueMapEntry_descriptor = internal_static_ForgeDataNotify_descriptor.getNestedTypes().get(0); internal_static_ForgeDataNotify_ForgeQueueMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeFormulaDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeFormulaDataNotifyOuterClass.java index c497989b892..99e76f26766 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeFormulaDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeFormulaDataNotifyOuterClass.java @@ -19,21 +19,21 @@ public interface ForgeFormulaDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_locked = 4; + * bool is_locked = 2; * @return The isLocked. */ boolean getIsLocked(); /** - * uint32 forge_id = 2; + * uint32 forge_id = 5; * @return The forgeId. */ int getForgeId(); } /** * 
-   * CmdId: 28490
-   * Obf: ILMLELNIKGE
+   * CmdId: 9617
+   * obf: IKKOMAKKLAO
    *
* * Protobuf type {@code ForgeFormulaDataNotify} @@ -82,12 +82,12 @@ private ForgeFormulaDataNotify( break; case 16: { - forgeId_ = input.readUInt32(); + isLocked_ = input.readBool(); break; } - case 32: { + case 40: { - isLocked_ = input.readBool(); + forgeId_ = input.readUInt32(); break; } default: { @@ -122,10 +122,10 @@ private ForgeFormulaDataNotify( emu.grasscutter.net.proto.ForgeFormulaDataNotifyOuterClass.ForgeFormulaDataNotify.class, emu.grasscutter.net.proto.ForgeFormulaDataNotifyOuterClass.ForgeFormulaDataNotify.Builder.class); } - public static final int IS_LOCKED_FIELD_NUMBER = 4; + public static final int IS_LOCKED_FIELD_NUMBER = 2; private boolean isLocked_; /** - * bool is_locked = 4; + * bool is_locked = 2; * @return The isLocked. */ @java.lang.Override @@ -133,10 +133,10 @@ public boolean getIsLocked() { return isLocked_; } - public static final int FORGE_ID_FIELD_NUMBER = 2; + public static final int FORGE_ID_FIELD_NUMBER = 5; private int forgeId_; /** - * uint32 forge_id = 2; + * uint32 forge_id = 5; * @return The forgeId. */ @java.lang.Override @@ -158,11 +158,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (forgeId_ != 0) { - output.writeUInt32(2, forgeId_); - } if (isLocked_ != false) { - output.writeBool(4, isLocked_); + output.writeBool(2, isLocked_); + } + if (forgeId_ != 0) { + output.writeUInt32(5, forgeId_); } unknownFields.writeTo(output); } @@ -173,13 +173,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (forgeId_ != 0) { + if (isLocked_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, forgeId_); + .computeBoolSize(2, isLocked_); } - if (isLocked_ != false) { + if (forgeId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, isLocked_); + .computeUInt32Size(5, forgeId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -313,8 +313,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28490
-     * Obf: ILMLELNIKGE
+     * CmdId: 9617
+     * obf: IKKOMAKKLAO
      *
* * Protobuf type {@code ForgeFormulaDataNotify} @@ -471,7 +471,7 @@ public Builder mergeFrom( private boolean isLocked_ ; /** - * bool is_locked = 4; + * bool is_locked = 2; * @return The isLocked. */ @java.lang.Override @@ -479,7 +479,7 @@ public boolean getIsLocked() { return isLocked_; } /** - * bool is_locked = 4; + * bool is_locked = 2; * @param value The isLocked to set. * @return This builder for chaining. */ @@ -490,7 +490,7 @@ public Builder setIsLocked(boolean value) { return this; } /** - * bool is_locked = 4; + * bool is_locked = 2; * @return This builder for chaining. */ public Builder clearIsLocked() { @@ -502,7 +502,7 @@ public Builder clearIsLocked() { private int forgeId_ ; /** - * uint32 forge_id = 2; + * uint32 forge_id = 5; * @return The forgeId. */ @java.lang.Override @@ -510,7 +510,7 @@ public int getForgeId() { return forgeId_; } /** - * uint32 forge_id = 2; + * uint32 forge_id = 5; * @param value The forgeId to set. * @return This builder for chaining. */ @@ -521,7 +521,7 @@ public Builder setForgeId(int value) { return this; } /** - * uint32 forge_id = 2; + * uint32 forge_id = 5; * @return This builder for chaining. */ public Builder clearForgeId() { @@ -598,8 +598,8 @@ public emu.grasscutter.net.proto.ForgeFormulaDataNotifyOuterClass.ForgeFormulaDa static { java.lang.String[] descriptorData = { "\n\034ForgeFormulaDataNotify.proto\"=\n\026ForgeF" + - "ormulaDataNotify\022\021\n\tis_locked\030\004 \001(\010\022\020\n\010f" + - "orge_id\030\002 \001(\rB\033\n\031emu.grasscutter.net.pro" + + "ormulaDataNotify\022\021\n\tis_locked\030\002 \001(\010\022\020\n\010f" + + "orge_id\030\005 \001(\rB\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeGetQueueDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeGetQueueDataRspOuterClass.java index a1ac0e6d383..92e2c8aaca9 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeGetQueueDataRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeGetQueueDataRspOuterClass.java @@ -25,17 +25,11 @@ public interface ForgeGetQueueDataRspOrBuilder extends int getMaxQueueNum(); /** - * int32 retcode = 11; - * @return The retcode. - */ - int getRetcode(); - - /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ int getForgeQueueMapCount(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ boolean containsForgeQueueMap( int key); @@ -46,28 +40,34 @@ boolean containsForgeQueueMap( java.util.Map getForgeQueueMap(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ java.util.Map getForgeQueueMapMap(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForgeQueueMapOrDefault( int key, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData defaultValue); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForgeQueueMapOrThrow( int key); + + /** + * int32 retcode = 14; + * @return The retcode. + */ + int getRetcode(); } /** * 
-   * CmdId: 9429
-   * Obf: HOLCPCEMEMI
+   * CmdId: 27281
+   * obf: FJCHDBCCPKN
    *
* * Protobuf type {@code ForgeGetQueueDataRsp} @@ -120,12 +120,7 @@ private ForgeGetQueueDataRsp( maxQueueNum_ = input.readUInt32(); break; } - case 88: { - - retcode_ = input.readInt32(); - break; - } - case 98: { + case 42: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { forgeQueueMap_ = com.google.protobuf.MapField.newMapField( ForgeQueueMapDefaultEntryHolder.defaultEntry); @@ -138,6 +133,11 @@ private ForgeGetQueueDataRsp( forgeQueueMap__.getKey(), forgeQueueMap__.getValue()); break; } + case 112: { + + retcode_ = input.readInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -167,7 +167,7 @@ private ForgeGetQueueDataRsp( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 12: + case 5: return internalGetForgeQueueMap(); default: throw new RuntimeException( @@ -193,18 +193,7 @@ public int getMaxQueueNum() { return maxQueueNum_; } - public static final int RETCODE_FIELD_NUMBER = 11; - private int retcode_; - /** - * int32 retcode = 11; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int FORGE_QUEUE_MAP_FIELD_NUMBER = 12; + public static final int FORGE_QUEUE_MAP_FIELD_NUMBER = 5; private static final class ForgeQueueMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData> defaultEntry = @@ -231,7 +220,7 @@ public int getForgeQueueMapCount() { return internalGetForgeQueueMap().getMap().size(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -249,7 +238,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -257,7 +246,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -270,7 +259,7 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -285,6 +274,17 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.get(key); } + public static final int RETCODE_FIELD_NUMBER = 14; + private int retcode_; + /** + * int32 retcode = 14; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -302,15 +302,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (maxQueueNum_ != 0) { output.writeUInt32(3, maxQueueNum_); } - if (retcode_ != 0) { - output.writeInt32(11, retcode_); - } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetForgeQueueMap(), ForgeQueueMapDefaultEntryHolder.defaultEntry, - 12); + 5); + if (retcode_ != 0) { + output.writeInt32(14, retcode_); + } unknownFields.writeTo(output); } @@ -324,10 +324,6 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(3, maxQueueNum_); } - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(11, retcode_); - } for (java.util.Map.Entry entry : internalGetForgeQueueMap().getMap().entrySet()) { com.google.protobuf.MapEntry @@ -336,7 +332,11 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, forgeQueueMap__); + .computeMessageSize(5, forgeQueueMap__); + } + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(14, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -355,10 +355,10 @@ public boolean equals(final java.lang.Object obj) { if (getMaxQueueNum() != other.getMaxQueueNum()) return false; - if (getRetcode() - != other.getRetcode()) return false; if (!internalGetForgeQueueMap().equals( other.internalGetForgeQueueMap())) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -372,12 +372,12 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + MAX_QUEUE_NUM_FIELD_NUMBER; hash = (53 * hash) + getMaxQueueNum(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); if (!internalGetForgeQueueMap().getMap().isEmpty()) { hash = (37 * hash) + FORGE_QUEUE_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetForgeQueueMap().hashCode(); } + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -475,8 +475,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 9429
-     * Obf: HOLCPCEMEMI
+     * CmdId: 27281
+     * obf: FJCHDBCCPKN
      *
* * Protobuf type {@code ForgeGetQueueDataRsp} @@ -494,7 +494,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 12: + case 5: return internalGetForgeQueueMap(); default: throw new RuntimeException( @@ -505,7 +505,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 12: + case 5: return internalGetMutableForgeQueueMap(); default: throw new RuntimeException( @@ -540,9 +540,9 @@ public Builder clear() { super.clear(); maxQueueNum_ = 0; + internalGetMutableForgeQueueMap().clear(); retcode_ = 0; - internalGetMutableForgeQueueMap().clear(); return this; } @@ -571,9 +571,9 @@ public emu.grasscutter.net.proto.ForgeGetQueueDataRspOuterClass.ForgeGetQueueDat emu.grasscutter.net.proto.ForgeGetQueueDataRspOuterClass.ForgeGetQueueDataRsp result = new emu.grasscutter.net.proto.ForgeGetQueueDataRspOuterClass.ForgeGetQueueDataRsp(this); int from_bitField0_ = bitField0_; result.maxQueueNum_ = maxQueueNum_; - result.retcode_ = retcode_; result.forgeQueueMap_ = internalGetForgeQueueMap(); result.forgeQueueMap_.makeImmutable(); + result.retcode_ = retcode_; onBuilt(); return result; } @@ -625,11 +625,11 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ForgeGetQueueDataRspOuterClas if (other.getMaxQueueNum() != 0) { setMaxQueueNum(other.getMaxQueueNum()); } + internalGetMutableForgeQueueMap().mergeFrom( + other.internalGetForgeQueueMap()); if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - internalGetMutableForgeQueueMap().mergeFrom( - other.internalGetForgeQueueMap()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -691,37 +691,6 @@ public Builder clearMaxQueueNum() { return this; } - private int retcode_ ; - /** - * int32 retcode = 11; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 11; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 11; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.MapField< java.lang.Integer, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData> forgeQueueMap_; private com.google.protobuf.MapField @@ -749,7 +718,7 @@ public int getForgeQueueMapCount() { return internalGetForgeQueueMap().getMap().size(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -767,7 +736,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -775,7 +744,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -788,7 +757,7 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -809,7 +778,7 @@ public Builder clearForgeQueueMap() { return this; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ public Builder removeForgeQueueMap( @@ -828,7 +797,7 @@ public Builder removeForgeQueueMap( return internalGetMutableForgeQueueMap().getMutableMap(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ public Builder putForgeQueueMap( int key, @@ -840,7 +809,7 @@ public Builder putForgeQueueMap( return this; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 12; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ public Builder putAllForgeQueueMap( @@ -849,6 +818,37 @@ public Builder putAllForgeQueueMap( .putAll(values); return this; } + + private int retcode_ ; + /** + * int32 retcode = 14; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 14; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 14; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -923,9 +923,9 @@ public emu.grasscutter.net.proto.ForgeGetQueueDataRspOuterClass.ForgeGetQueueDat java.lang.String[] descriptorData = { "\n\032ForgeGetQueueDataRsp.proto\032\024ForgeQueue" + "Data.proto\"\310\001\n\024ForgeGetQueueDataRsp\022\025\n\rm" + - "ax_queue_num\030\003 \001(\r\022\017\n\007retcode\030\013 \001(\005\022A\n\017f" + - "orge_queue_map\030\014 \003(\0132(.ForgeGetQueueData" + - "Rsp.ForgeQueueMapEntry\032E\n\022ForgeQueueMapE" + + "ax_queue_num\030\003 \001(\r\022A\n\017forge_queue_map\030\005 " + + "\003(\0132(.ForgeGetQueueDataRsp.ForgeQueueMap" + + "Entry\022\017\n\007retcode\030\016 \001(\005\032E\n\022ForgeQueueMapE" + "ntry\022\013\n\003key\030\001 \001(\r\022\036\n\005value\030\002 \001(\0132\017.Forge" + "QueueData:\0028\001B\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" @@ -940,7 +940,7 @@ public emu.grasscutter.net.proto.ForgeGetQueueDataRspOuterClass.ForgeGetQueueDat internal_static_ForgeGetQueueDataRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ForgeGetQueueDataRsp_descriptor, - new java.lang.String[] { "MaxQueueNum", "Retcode", "ForgeQueueMap", }); + new java.lang.String[] { "MaxQueueNum", "ForgeQueueMap", "Retcode", }); internal_static_ForgeGetQueueDataRsp_ForgeQueueMapEntry_descriptor = internal_static_ForgeGetQueueDataRsp_descriptor.getNestedTypes().get(0); internal_static_ForgeGetQueueDataRsp_ForgeQueueMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataNotifyOuterClass.java index de605a160e8..382fa6ab78a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataNotifyOuterClass.java @@ -19,11 +19,11 @@ public interface ForgeQueueDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ int getForgeQueueMapCount(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ boolean containsForgeQueueMap( int key); @@ -34,36 +34,36 @@ boolean containsForgeQueueMap( java.util.Map getForgeQueueMap(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ java.util.Map getForgeQueueMapMap(); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForgeQueueMapOrDefault( int key, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData defaultValue); /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForgeQueueMapOrThrow( int key); /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @return A list containing the removedForgeQueueList. */ java.util.List getRemovedForgeQueueListList(); /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @return The count of removedForgeQueueList. */ int getRemovedForgeQueueListCount(); /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @param index The index of the element to return. * @return The removedForgeQueueList at the given index. */ @@ -71,8 +71,8 @@ emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForgeQueueM } /** * 
-   * CmdId: 29143
-   * Obf: NEHKBDCNEMA
+   * CmdId: 28170
+   * obf: MFLIJJICKNJ
    *
* * Protobuf type {@code ForgeQueueDataNotify} @@ -121,7 +121,7 @@ private ForgeQueueDataNotify( case 0: done = true; break; - case 90: { + case 42: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { forgeQueueMap_ = com.google.protobuf.MapField.newMapField( ForgeQueueMapDefaultEntryHolder.defaultEntry); @@ -134,7 +134,7 @@ private ForgeQueueDataNotify( forgeQueueMap__.getKey(), forgeQueueMap__.getValue()); break; } - case 104: { + case 88: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { removedForgeQueueList_ = newIntList(); mutable_bitField0_ |= 0x00000002; @@ -142,7 +142,7 @@ private ForgeQueueDataNotify( removedForgeQueueList_.addInt(input.readUInt32()); break; } - case 106: { + case 90: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { @@ -187,7 +187,7 @@ private ForgeQueueDataNotify( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 11: + case 5: return internalGetForgeQueueMap(); default: throw new RuntimeException( @@ -202,7 +202,7 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.ForgeQueueDataNotifyOuterClass.ForgeQueueDataNotify.class, emu.grasscutter.net.proto.ForgeQueueDataNotifyOuterClass.ForgeQueueDataNotify.Builder.class); } - public static final int FORGE_QUEUE_MAP_FIELD_NUMBER = 11; + public static final int FORGE_QUEUE_MAP_FIELD_NUMBER = 5; private static final class ForgeQueueMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData> defaultEntry = @@ -229,7 +229,7 @@ public int getForgeQueueMapCount() { return internalGetForgeQueueMap().getMap().size(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -247,7 +247,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -255,7 +255,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -268,7 +268,7 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -283,10 +283,10 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.get(key); } - public static final int REMOVED_FORGE_QUEUE_LIST_FIELD_NUMBER = 13; + public static final int REMOVED_FORGE_QUEUE_LIST_FIELD_NUMBER = 11; private com.google.protobuf.Internal.IntList removedForgeQueueList_; /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @return A list containing the removedForgeQueueList. */ @java.lang.Override @@ -295,14 +295,14 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return removedForgeQueueList_; } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @return The count of removedForgeQueueList. */ public int getRemovedForgeQueueListCount() { return removedForgeQueueList_.size(); } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @param index The index of the element to return. * @return The removedForgeQueueList at the given index. */ @@ -331,9 +331,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output, internalGetForgeQueueMap(), ForgeQueueMapDefaultEntryHolder.defaultEntry, - 11); + 5); if (getRemovedForgeQueueListList().size() > 0) { - output.writeUInt32NoTag(106); + output.writeUInt32NoTag(90); output.writeUInt32NoTag(removedForgeQueueListMemoizedSerializedSize); } for (int i = 0; i < removedForgeQueueList_.size(); i++) { @@ -356,7 +356,7 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, forgeQueueMap__); + .computeMessageSize(5, forgeQueueMap__); } { int dataSize = 0; @@ -507,8 +507,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29143
-     * Obf: NEHKBDCNEMA
+     * CmdId: 28170
+     * obf: MFLIJJICKNJ
      *
* * Protobuf type {@code ForgeQueueDataNotify} @@ -526,7 +526,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 11: + case 5: return internalGetForgeQueueMap(); default: throw new RuntimeException( @@ -537,7 +537,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 11: + case 5: return internalGetMutableForgeQueueMap(); default: throw new RuntimeException( @@ -724,7 +724,7 @@ public int getForgeQueueMapCount() { return internalGetForgeQueueMap().getMap().size(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -742,7 +742,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -750,7 +750,7 @@ public java.util.Mapmap<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -763,7 +763,7 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getForg return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ @java.lang.Override @@ -784,7 +784,7 @@ public Builder clearForgeQueueMap() { return this; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ public Builder removeForgeQueueMap( @@ -803,7 +803,7 @@ public Builder removeForgeQueueMap( return internalGetMutableForgeQueueMap().getMutableMap(); } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ public Builder putForgeQueueMap( int key, @@ -815,7 +815,7 @@ public Builder putForgeQueueMap( return this; } /** - * map<uint32, .ForgeQueueData> forge_queue_map = 11; + * map<uint32, .ForgeQueueData> forge_queue_map = 5; */ public Builder putAllForgeQueueMap( @@ -833,7 +833,7 @@ private void ensureRemovedForgeQueueListIsMutable() { } } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @return A list containing the removedForgeQueueList. */ public java.util.List @@ -842,14 +842,14 @@ private void ensureRemovedForgeQueueListIsMutable() { java.util.Collections.unmodifiableList(removedForgeQueueList_) : removedForgeQueueList_; } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @return The count of removedForgeQueueList. */ public int getRemovedForgeQueueListCount() { return removedForgeQueueList_.size(); } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @param index The index of the element to return. * @return The removedForgeQueueList at the given index. */ @@ -857,7 +857,7 @@ public int getRemovedForgeQueueList(int index) { return removedForgeQueueList_.getInt(index); } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @param index The index to set the value at. * @param value The removedForgeQueueList to set. * @return This builder for chaining. @@ -870,7 +870,7 @@ public Builder setRemovedForgeQueueList( return this; } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @param value The removedForgeQueueList to add. * @return This builder for chaining. */ @@ -881,7 +881,7 @@ public Builder addRemovedForgeQueueList(int value) { return this; } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @param values The removedForgeQueueList to add. * @return This builder for chaining. */ @@ -894,7 +894,7 @@ public Builder addAllRemovedForgeQueueList( return this; } /** - * repeated uint32 removed_forge_queue_list = 13; + * repeated uint32 removed_forge_queue_list = 11; * @return This builder for chaining. */ public Builder clearRemovedForgeQueueList() { @@ -977,9 +977,9 @@ public emu.grasscutter.net.proto.ForgeQueueDataNotifyOuterClass.ForgeQueueDataNo java.lang.String[] descriptorData = { "\n\032ForgeQueueDataNotify.proto\032\024ForgeQueue" + "Data.proto\"\302\001\n\024ForgeQueueDataNotify\022A\n\017f" + - "orge_queue_map\030\013 \003(\0132(.ForgeQueueDataNot" + + "orge_queue_map\030\005 \003(\0132(.ForgeQueueDataNot" + "ify.ForgeQueueMapEntry\022 \n\030removed_forge_" + - "queue_list\030\r \003(\r\032E\n\022ForgeQueueMapEntry\022\013" + + "queue_list\030\013 \003(\r\032E\n\022ForgeQueueMapEntry\022\013" + "\n\003key\030\001 \001(\r\022\036\n\005value\030\002 \001(\0132\017.ForgeQueueD" + "ata:\0028\001B\033\n\031emu.grasscutter.net.protob\006pr" + "oto3" diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java index 52391b233db..66443083320 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeQueueDataOuterClass.java @@ -19,16 +19,16 @@ public interface ForgeQueueDataOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 total_finish_timestamp = 13; + * uint32 total_finish_timestamp = 1; * @return The totalFinishTimestamp. */ int getTotalFinishTimestamp(); /** - * uint32 avatar_id = 8; - * @return The avatarId. + * uint32 forge_id = 2; + * @return The forgeId. */ - int getAvatarId(); + int getForgeId(); /** * uint32 finish_count = 3; @@ -37,32 +37,33 @@ public interface ForgeQueueDataOrBuilder extends int getFinishCount(); /** - * uint32 queueId = 14; + * uint32 avatar_id = 7; + * @return The avatarId. + */ + int getAvatarId(); + + /** + * uint32 queueId = 8; * @return The queueId. */ int getQueueId(); /** - * uint32 unfinishCount = 11; + * uint32 unfinishCount = 12; * @return The unfinishCount. */ int getUnfinishCount(); /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 13; * @return The nextFinishTimestamp. */ int getNextFinishTimestamp(); - - /** - * uint32 forge_id = 15; - * @return The forgeId. - */ - int getForgeId(); } /** * 
-   * Obf: NBNGELFILMP
+   *字段大概率有不对的
+   * obf: GHFLHLFMFPL
    *
* * Protobuf type {@code ForgeQueueData} @@ -109,39 +110,39 @@ private ForgeQueueData( case 0: done = true; break; - case 24: { + case 8: { - finishCount_ = input.readUInt32(); + totalFinishTimestamp_ = input.readUInt32(); break; } - case 32: { + case 16: { - nextFinishTimestamp_ = input.readUInt32(); + forgeId_ = input.readUInt32(); break; } - case 64: { + case 24: { - avatarId_ = input.readUInt32(); + finishCount_ = input.readUInt32(); break; } - case 88: { + case 56: { - unfinishCount_ = input.readUInt32(); + avatarId_ = input.readUInt32(); break; } - case 104: { + case 64: { - totalFinishTimestamp_ = input.readUInt32(); + queueId_ = input.readUInt32(); break; } - case 112: { + case 96: { - queueId_ = input.readUInt32(); + unfinishCount_ = input.readUInt32(); break; } - case 120: { + case 104: { - forgeId_ = input.readUInt32(); + nextFinishTimestamp_ = input.readUInt32(); break; } default: { @@ -176,10 +177,10 @@ private ForgeQueueData( emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.class, emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData.Builder.class); } - public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 13; + public static final int TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER = 1; private int totalFinishTimestamp_; /** - * uint32 total_finish_timestamp = 13; + * uint32 total_finish_timestamp = 1; * @return The totalFinishTimestamp. */ @java.lang.Override @@ -187,15 +188,15 @@ public int getTotalFinishTimestamp() { return totalFinishTimestamp_; } - public static final int AVATAR_ID_FIELD_NUMBER = 8; - private int avatarId_; + public static final int FORGE_ID_FIELD_NUMBER = 2; + private int forgeId_; /** - * uint32 avatar_id = 8; - * @return The avatarId. + * uint32 forge_id = 2; + * @return The forgeId. */ @java.lang.Override - public int getAvatarId() { - return avatarId_; + public int getForgeId() { + return forgeId_; } public static final int FINISH_COUNT_FIELD_NUMBER = 3; @@ -209,10 +210,21 @@ public int getFinishCount() { return finishCount_; } - public static final int QUEUEID_FIELD_NUMBER = 14; + public static final int AVATAR_ID_FIELD_NUMBER = 7; + private int avatarId_; + /** + * uint32 avatar_id = 7; + * @return The avatarId. + */ + @java.lang.Override + public int getAvatarId() { + return avatarId_; + } + + public static final int QUEUEID_FIELD_NUMBER = 8; private int queueId_; /** - * uint32 queueId = 14; + * uint32 queueId = 8; * @return The queueId. */ @java.lang.Override @@ -220,10 +232,10 @@ public int getQueueId() { return queueId_; } - public static final int UNFINISHCOUNT_FIELD_NUMBER = 11; + public static final int UNFINISHCOUNT_FIELD_NUMBER = 12; private int unfinishCount_; /** - * uint32 unfinishCount = 11; + * uint32 unfinishCount = 12; * @return The unfinishCount. */ @java.lang.Override @@ -231,10 +243,10 @@ public int getUnfinishCount() { return unfinishCount_; } - public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 4; + public static final int NEXT_FINISH_TIMESTAMP_FIELD_NUMBER = 13; private int nextFinishTimestamp_; /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 13; * @return The nextFinishTimestamp. */ @java.lang.Override @@ -242,17 +254,6 @@ public int getNextFinishTimestamp() { return nextFinishTimestamp_; } - public static final int FORGE_ID_FIELD_NUMBER = 15; - private int forgeId_; - /** - * uint32 forge_id = 15; - * @return The forgeId. - */ - @java.lang.Override - public int getForgeId() { - return forgeId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -267,26 +268,26 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (totalFinishTimestamp_ != 0) { + output.writeUInt32(1, totalFinishTimestamp_); + } + if (forgeId_ != 0) { + output.writeUInt32(2, forgeId_); + } if (finishCount_ != 0) { output.writeUInt32(3, finishCount_); } - if (nextFinishTimestamp_ != 0) { - output.writeUInt32(4, nextFinishTimestamp_); - } if (avatarId_ != 0) { - output.writeUInt32(8, avatarId_); - } - if (unfinishCount_ != 0) { - output.writeUInt32(11, unfinishCount_); - } - if (totalFinishTimestamp_ != 0) { - output.writeUInt32(13, totalFinishTimestamp_); + output.writeUInt32(7, avatarId_); } if (queueId_ != 0) { - output.writeUInt32(14, queueId_); + output.writeUInt32(8, queueId_); } - if (forgeId_ != 0) { - output.writeUInt32(15, forgeId_); + if (unfinishCount_ != 0) { + output.writeUInt32(12, unfinishCount_); + } + if (nextFinishTimestamp_ != 0) { + output.writeUInt32(13, nextFinishTimestamp_); } unknownFields.writeTo(output); } @@ -297,33 +298,33 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (finishCount_ != 0) { + if (totalFinishTimestamp_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, finishCount_); + .computeUInt32Size(1, totalFinishTimestamp_); } - if (nextFinishTimestamp_ != 0) { + if (forgeId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, nextFinishTimestamp_); + .computeUInt32Size(2, forgeId_); } - if (avatarId_ != 0) { + if (finishCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, avatarId_); + .computeUInt32Size(3, finishCount_); } - if (unfinishCount_ != 0) { + if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, unfinishCount_); + .computeUInt32Size(7, avatarId_); } - if (totalFinishTimestamp_ != 0) { + if (queueId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, totalFinishTimestamp_); + .computeUInt32Size(8, queueId_); } - if (queueId_ != 0) { + if (unfinishCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, queueId_); + .computeUInt32Size(12, unfinishCount_); } - if (forgeId_ != 0) { + if (nextFinishTimestamp_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, forgeId_); + .computeUInt32Size(13, nextFinishTimestamp_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -342,18 +343,18 @@ public boolean equals(final java.lang.Object obj) { if (getTotalFinishTimestamp() != other.getTotalFinishTimestamp()) return false; - if (getAvatarId() - != other.getAvatarId()) return false; + if (getForgeId() + != other.getForgeId()) return false; if (getFinishCount() != other.getFinishCount()) return false; + if (getAvatarId() + != other.getAvatarId()) return false; if (getQueueId() != other.getQueueId()) return false; if (getUnfinishCount() != other.getUnfinishCount()) return false; if (getNextFinishTimestamp() != other.getNextFinishTimestamp()) return false; - if (getForgeId() - != other.getForgeId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -367,18 +368,18 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + TOTAL_FINISH_TIMESTAMP_FIELD_NUMBER; hash = (53 * hash) + getTotalFinishTimestamp(); - hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; - hash = (53 * hash) + getAvatarId(); + hash = (37 * hash) + FORGE_ID_FIELD_NUMBER; + hash = (53 * hash) + getForgeId(); hash = (37 * hash) + FINISH_COUNT_FIELD_NUMBER; hash = (53 * hash) + getFinishCount(); + hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; + hash = (53 * hash) + getAvatarId(); hash = (37 * hash) + QUEUEID_FIELD_NUMBER; hash = (53 * hash) + getQueueId(); hash = (37 * hash) + UNFINISHCOUNT_FIELD_NUMBER; hash = (53 * hash) + getUnfinishCount(); hash = (37 * hash) + NEXT_FINISH_TIMESTAMP_FIELD_NUMBER; hash = (53 * hash) + getNextFinishTimestamp(); - hash = (37 * hash) + FORGE_ID_FIELD_NUMBER; - hash = (53 * hash) + getForgeId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -476,7 +477,8 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: NBNGELFILMP
+     *字段大概率有不对的
+     * obf: GHFLHLFMFPL
      *
* * Protobuf type {@code ForgeQueueData} @@ -518,18 +520,18 @@ public Builder clear() { super.clear(); totalFinishTimestamp_ = 0; - avatarId_ = 0; + forgeId_ = 0; finishCount_ = 0; + avatarId_ = 0; + queueId_ = 0; unfinishCount_ = 0; nextFinishTimestamp_ = 0; - forgeId_ = 0; - return this; } @@ -557,12 +559,12 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData build() public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData buildPartial() { emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData result = new emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData(this); result.totalFinishTimestamp_ = totalFinishTimestamp_; - result.avatarId_ = avatarId_; + result.forgeId_ = forgeId_; result.finishCount_ = finishCount_; + result.avatarId_ = avatarId_; result.queueId_ = queueId_; result.unfinishCount_ = unfinishCount_; result.nextFinishTimestamp_ = nextFinishTimestamp_; - result.forgeId_ = forgeId_; onBuilt(); return result; } @@ -614,12 +616,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ForgeQueueDataOuterClass.Forg if (other.getTotalFinishTimestamp() != 0) { setTotalFinishTimestamp(other.getTotalFinishTimestamp()); } - if (other.getAvatarId() != 0) { - setAvatarId(other.getAvatarId()); + if (other.getForgeId() != 0) { + setForgeId(other.getForgeId()); } if (other.getFinishCount() != 0) { setFinishCount(other.getFinishCount()); } + if (other.getAvatarId() != 0) { + setAvatarId(other.getAvatarId()); + } if (other.getQueueId() != 0) { setQueueId(other.getQueueId()); } @@ -629,9 +634,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ForgeQueueDataOuterClass.Forg if (other.getNextFinishTimestamp() != 0) { setNextFinishTimestamp(other.getNextFinishTimestamp()); } - if (other.getForgeId() != 0) { - setForgeId(other.getForgeId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -663,7 +665,7 @@ public Builder mergeFrom( private int totalFinishTimestamp_ ; /** - * uint32 total_finish_timestamp = 13; + * uint32 total_finish_timestamp = 1; * @return The totalFinishTimestamp. */ @java.lang.Override @@ -671,7 +673,7 @@ public int getTotalFinishTimestamp() { return totalFinishTimestamp_; } /** - * uint32 total_finish_timestamp = 13; + * uint32 total_finish_timestamp = 1; * @param value The totalFinishTimestamp to set. * @return This builder for chaining. */ @@ -682,7 +684,7 @@ public Builder setTotalFinishTimestamp(int value) { return this; } /** - * uint32 total_finish_timestamp = 13; + * uint32 total_finish_timestamp = 1; * @return This builder for chaining. */ public Builder clearTotalFinishTimestamp() { @@ -692,33 +694,33 @@ public Builder clearTotalFinishTimestamp() { return this; } - private int avatarId_ ; + private int forgeId_ ; /** - * uint32 avatar_id = 8; - * @return The avatarId. + * uint32 forge_id = 2; + * @return The forgeId. */ @java.lang.Override - public int getAvatarId() { - return avatarId_; + public int getForgeId() { + return forgeId_; } /** - * uint32 avatar_id = 8; - * @param value The avatarId to set. + * uint32 forge_id = 2; + * @param value The forgeId to set. * @return This builder for chaining. */ - public Builder setAvatarId(int value) { + public Builder setForgeId(int value) { - avatarId_ = value; + forgeId_ = value; onChanged(); return this; } /** - * uint32 avatar_id = 8; + * uint32 forge_id = 2; * @return This builder for chaining. */ - public Builder clearAvatarId() { + public Builder clearForgeId() { - avatarId_ = 0; + forgeId_ = 0; onChanged(); return this; } @@ -754,9 +756,40 @@ public Builder clearFinishCount() { return this; } + private int avatarId_ ; + /** + * uint32 avatar_id = 7; + * @return The avatarId. + */ + @java.lang.Override + public int getAvatarId() { + return avatarId_; + } + /** + * uint32 avatar_id = 7; + * @param value The avatarId to set. + * @return This builder for chaining. + */ + public Builder setAvatarId(int value) { + + avatarId_ = value; + onChanged(); + return this; + } + /** + * uint32 avatar_id = 7; + * @return This builder for chaining. + */ + public Builder clearAvatarId() { + + avatarId_ = 0; + onChanged(); + return this; + } + private int queueId_ ; /** - * uint32 queueId = 14; + * uint32 queueId = 8; * @return The queueId. */ @java.lang.Override @@ -764,7 +797,7 @@ public int getQueueId() { return queueId_; } /** - * uint32 queueId = 14; + * uint32 queueId = 8; * @param value The queueId to set. * @return This builder for chaining. */ @@ -775,7 +808,7 @@ public Builder setQueueId(int value) { return this; } /** - * uint32 queueId = 14; + * uint32 queueId = 8; * @return This builder for chaining. */ public Builder clearQueueId() { @@ -787,7 +820,7 @@ public Builder clearQueueId() { private int unfinishCount_ ; /** - * uint32 unfinishCount = 11; + * uint32 unfinishCount = 12; * @return The unfinishCount. */ @java.lang.Override @@ -795,7 +828,7 @@ public int getUnfinishCount() { return unfinishCount_; } /** - * uint32 unfinishCount = 11; + * uint32 unfinishCount = 12; * @param value The unfinishCount to set. * @return This builder for chaining. */ @@ -806,7 +839,7 @@ public Builder setUnfinishCount(int value) { return this; } /** - * uint32 unfinishCount = 11; + * uint32 unfinishCount = 12; * @return This builder for chaining. */ public Builder clearUnfinishCount() { @@ -818,7 +851,7 @@ public Builder clearUnfinishCount() { private int nextFinishTimestamp_ ; /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 13; * @return The nextFinishTimestamp. */ @java.lang.Override @@ -826,7 +859,7 @@ public int getNextFinishTimestamp() { return nextFinishTimestamp_; } /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 13; * @param value The nextFinishTimestamp to set. * @return This builder for chaining. */ @@ -837,7 +870,7 @@ public Builder setNextFinishTimestamp(int value) { return this; } /** - * uint32 next_finish_timestamp = 4; + * uint32 next_finish_timestamp = 13; * @return This builder for chaining. */ public Builder clearNextFinishTimestamp() { @@ -846,37 +879,6 @@ public Builder clearNextFinishTimestamp() { onChanged(); return this; } - - private int forgeId_ ; - /** - * uint32 forge_id = 15; - * @return The forgeId. - */ - @java.lang.Override - public int getForgeId() { - return forgeId_; - } - /** - * uint32 forge_id = 15; - * @param value The forgeId to set. - * @return This builder for chaining. - */ - public Builder setForgeId(int value) { - - forgeId_ = value; - onChanged(); - return this; - } - /** - * uint32 forge_id = 15; - * @return This builder for chaining. - */ - public Builder clearForgeId() { - - forgeId_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -945,10 +947,10 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getDefa static { java.lang.String[] descriptorData = { "\n\024ForgeQueueData.proto\"\262\001\n\016ForgeQueueDat" + - "a\022\036\n\026total_finish_timestamp\030\r \001(\r\022\021\n\tava" + - "tar_id\030\010 \001(\r\022\024\n\014finish_count\030\003 \001(\r\022\017\n\007qu" + - "eueId\030\016 \001(\r\022\025\n\runfinishCount\030\013 \001(\r\022\035\n\025ne" + - "xt_finish_timestamp\030\004 \001(\r\022\020\n\010forge_id\030\017 " + + "a\022\036\n\026total_finish_timestamp\030\001 \001(\r\022\020\n\010for" + + "ge_id\030\002 \001(\r\022\024\n\014finish_count\030\003 \001(\r\022\021\n\tava" + + "tar_id\030\007 \001(\r\022\017\n\007queueId\030\010 \001(\r\022\025\n\runfinis" + + "hCount\030\014 \001(\r\022\035\n\025next_finish_timestamp\030\r " + "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -960,7 +962,7 @@ public emu.grasscutter.net.proto.ForgeQueueDataOuterClass.ForgeQueueData getDefa internal_static_ForgeQueueData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ForgeQueueData_descriptor, - new java.lang.String[] { "TotalFinishTimestamp", "AvatarId", "FinishCount", "QueueId", "UnfinishCount", "NextFinishTimestamp", "ForgeId", }); + new java.lang.String[] { "TotalFinishTimestamp", "ForgeId", "FinishCount", "AvatarId", "QueueId", "UnfinishCount", "NextFinishTimestamp", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForgeStartReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForgeStartReqOuterClass.java index 3b9db5f8d22..4497b665f10 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ForgeStartReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ForgeStartReqOuterClass.java @@ -19,27 +19,27 @@ public interface ForgeStartReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 avatar_id = 5; + * uint32 avatar_id = 13; * @return The avatarId. */ int getAvatarId(); /** - * uint32 forge_count = 8; - * @return The forgeCount. + * uint32 forge_id = 14; + * @return The forgeId. */ - int getForgeCount(); + int getForgeId(); /** - * uint32 forge_id = 1; - * @return The forgeId. + * uint32 forge_count = 7; + * @return The forgeCount. */ - int getForgeId(); + int getForgeCount(); } /** * 
-   * CmdId: 28979
-   * Obf: BKGLNOOLDEJ
+   * CmdId: 29987
+   * obf: OOGMGDJIEGJ
    *
* * Protobuf type {@code ForgeStartReq} @@ -86,19 +86,19 @@ private ForgeStartReq( case 0: done = true; break; - case 8: { + case 56: { - forgeId_ = input.readUInt32(); + forgeCount_ = input.readUInt32(); break; } - case 40: { + case 104: { avatarId_ = input.readUInt32(); break; } - case 64: { + case 112: { - forgeCount_ = input.readUInt32(); + forgeId_ = input.readUInt32(); break; } default: { @@ -133,10 +133,10 @@ private ForgeStartReq( emu.grasscutter.net.proto.ForgeStartReqOuterClass.ForgeStartReq.class, emu.grasscutter.net.proto.ForgeStartReqOuterClass.ForgeStartReq.Builder.class); } - public static final int AVATAR_ID_FIELD_NUMBER = 5; + public static final int AVATAR_ID_FIELD_NUMBER = 13; private int avatarId_; /** - * uint32 avatar_id = 5; + * uint32 avatar_id = 13; * @return The avatarId. */ @java.lang.Override @@ -144,26 +144,26 @@ public int getAvatarId() { return avatarId_; } - public static final int FORGE_COUNT_FIELD_NUMBER = 8; - private int forgeCount_; + public static final int FORGE_ID_FIELD_NUMBER = 14; + private int forgeId_; /** - * uint32 forge_count = 8; - * @return The forgeCount. + * uint32 forge_id = 14; + * @return The forgeId. */ @java.lang.Override - public int getForgeCount() { - return forgeCount_; + public int getForgeId() { + return forgeId_; } - public static final int FORGE_ID_FIELD_NUMBER = 1; - private int forgeId_; + public static final int FORGE_COUNT_FIELD_NUMBER = 7; + private int forgeCount_; /** - * uint32 forge_id = 1; - * @return The forgeId. + * uint32 forge_count = 7; + * @return The forgeCount. */ @java.lang.Override - public int getForgeId() { - return forgeId_; + public int getForgeCount() { + return forgeCount_; } private byte memoizedIsInitialized = -1; @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (forgeId_ != 0) { - output.writeUInt32(1, forgeId_); + if (forgeCount_ != 0) { + output.writeUInt32(7, forgeCount_); } if (avatarId_ != 0) { - output.writeUInt32(5, avatarId_); + output.writeUInt32(13, avatarId_); } - if (forgeCount_ != 0) { - output.writeUInt32(8, forgeCount_); + if (forgeId_ != 0) { + output.writeUInt32(14, forgeId_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (forgeId_ != 0) { + if (forgeCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, forgeId_); + .computeUInt32Size(7, forgeCount_); } if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, avatarId_); + .computeUInt32Size(13, avatarId_); } - if (forgeCount_ != 0) { + if (forgeId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, forgeCount_); + .computeUInt32Size(14, forgeId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -227,10 +227,10 @@ public boolean equals(final java.lang.Object obj) { if (getAvatarId() != other.getAvatarId()) return false; - if (getForgeCount() - != other.getForgeCount()) return false; if (getForgeId() != other.getForgeId()) return false; + if (getForgeCount() + != other.getForgeCount()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -244,10 +244,10 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; hash = (53 * hash) + getAvatarId(); - hash = (37 * hash) + FORGE_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getForgeCount(); hash = (37 * hash) + FORGE_ID_FIELD_NUMBER; hash = (53 * hash) + getForgeId(); + hash = (37 * hash) + FORGE_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getForgeCount(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28979
-     * Obf: BKGLNOOLDEJ
+     * CmdId: 29987
+     * obf: OOGMGDJIEGJ
      *
* * Protobuf type {@code ForgeStartReq} @@ -388,10 +388,10 @@ public Builder clear() { super.clear(); avatarId_ = 0; - forgeCount_ = 0; - forgeId_ = 0; + forgeCount_ = 0; + return this; } @@ -419,8 +419,8 @@ public emu.grasscutter.net.proto.ForgeStartReqOuterClass.ForgeStartReq build() { public emu.grasscutter.net.proto.ForgeStartReqOuterClass.ForgeStartReq buildPartial() { emu.grasscutter.net.proto.ForgeStartReqOuterClass.ForgeStartReq result = new emu.grasscutter.net.proto.ForgeStartReqOuterClass.ForgeStartReq(this); result.avatarId_ = avatarId_; - result.forgeCount_ = forgeCount_; result.forgeId_ = forgeId_; + result.forgeCount_ = forgeCount_; onBuilt(); return result; } @@ -472,12 +472,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ForgeStartReqOuterClass.Forge if (other.getAvatarId() != 0) { setAvatarId(other.getAvatarId()); } - if (other.getForgeCount() != 0) { - setForgeCount(other.getForgeCount()); - } if (other.getForgeId() != 0) { setForgeId(other.getForgeId()); } + if (other.getForgeCount() != 0) { + setForgeCount(other.getForgeCount()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -509,7 +509,7 @@ public Builder mergeFrom( private int avatarId_ ; /** - * uint32 avatar_id = 5; + * uint32 avatar_id = 13; * @return The avatarId. */ @java.lang.Override @@ -517,7 +517,7 @@ public int getAvatarId() { return avatarId_; } /** - * uint32 avatar_id = 5; + * uint32 avatar_id = 13; * @param value The avatarId to set. * @return This builder for chaining. */ @@ -528,7 +528,7 @@ public Builder setAvatarId(int value) { return this; } /** - * uint32 avatar_id = 5; + * uint32 avatar_id = 13; * @return This builder for chaining. */ public Builder clearAvatarId() { @@ -538,64 +538,64 @@ public Builder clearAvatarId() { return this; } - private int forgeCount_ ; + private int forgeId_ ; /** - * uint32 forge_count = 8; - * @return The forgeCount. + * uint32 forge_id = 14; + * @return The forgeId. */ @java.lang.Override - public int getForgeCount() { - return forgeCount_; + public int getForgeId() { + return forgeId_; } /** - * uint32 forge_count = 8; - * @param value The forgeCount to set. + * uint32 forge_id = 14; + * @param value The forgeId to set. * @return This builder for chaining. */ - public Builder setForgeCount(int value) { + public Builder setForgeId(int value) { - forgeCount_ = value; + forgeId_ = value; onChanged(); return this; } /** - * uint32 forge_count = 8; + * uint32 forge_id = 14; * @return This builder for chaining. */ - public Builder clearForgeCount() { + public Builder clearForgeId() { - forgeCount_ = 0; + forgeId_ = 0; onChanged(); return this; } - private int forgeId_ ; + private int forgeCount_ ; /** - * uint32 forge_id = 1; - * @return The forgeId. + * uint32 forge_count = 7; + * @return The forgeCount. */ @java.lang.Override - public int getForgeId() { - return forgeId_; + public int getForgeCount() { + return forgeCount_; } /** - * uint32 forge_id = 1; - * @param value The forgeId to set. + * uint32 forge_count = 7; + * @param value The forgeCount to set. * @return This builder for chaining. */ - public Builder setForgeId(int value) { + public Builder setForgeCount(int value) { - forgeId_ = value; + forgeCount_ = value; onChanged(); return this; } /** - * uint32 forge_id = 1; + * uint32 forge_count = 7; * @return This builder for chaining. */ - public Builder clearForgeId() { + public Builder clearForgeCount() { - forgeId_ = 0; + forgeCount_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.ForgeStartReqOuterClass.ForgeStartReq getDefaul static { java.lang.String[] descriptorData = { "\n\023ForgeStartReq.proto\"I\n\rForgeStartReq\022\021" + - "\n\tavatar_id\030\005 \001(\r\022\023\n\013forge_count\030\010 \001(\r\022\020" + - "\n\010forge_id\030\001 \001(\rB\033\n\031emu.grasscutter.net." + + "\n\tavatar_id\030\r \001(\r\022\020\n\010forge_id\030\016 \001(\r\022\023\n\013f" + + "orge_count\030\007 \001(\rB\033\n\031emu.grasscutter.net." + "protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.ForgeStartReqOuterClass.ForgeStartReq getDefaul internal_static_ForgeStartReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ForgeStartReq_descriptor, - new java.lang.String[] { "AvatarId", "ForgeCount", "ForgeId", }); + new java.lang.String[] { "AvatarId", "ForgeId", "ForgeCount", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FungusFighterV2SettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FungusFighterV2SettleInfoOuterClass.java index 14a3527c247..bcb4e0f2374 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/FungusFighterV2SettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/FungusFighterV2SettleInfoOuterClass.java @@ -19,46 +19,42 @@ public interface FungusFighterV2SettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 GOJKOCDIMEO = 11; - * @return The gOJKOCDIMEO. + * bool is_new_record = 1; + * @return The isNewRecord. */ - int getGOJKOCDIMEO(); + boolean getIsNewRecord(); /** - * uint32 level_id = 6; - * @return The levelId. + * uint32 JOFBEIACLOF = 2; + * @return The jOFBEIACLOF. */ - int getLevelId(); + int getJOFBEIACLOF(); /** - * uint32 OGOLIHBAJDL = 3; - * @return The oGOLIHBAJDL. + * uint32 PJJAOILBFBN = 5; + * @return The pJJAOILBFBN. */ - int getOGOLIHBAJDL(); + int getPJJAOILBFBN(); /** - * bool is_new_record = 8; - * @return The isNewRecord. + * uint32 CFBLFKNOJIK = 10; + * @return The cFBLFKNOJIK. */ - boolean getIsNewRecord(); + int getCFBLFKNOJIK(); /** - * uint32 cost_time = 13; - * @return The costTime. + * uint32 EHGIJGCNHKL = 11; + * @return The eHGIJGCNHKL. */ - int getCostTime(); + int getEHGIJGCNHKL(); /** - * uint32 IBJOJJBHKCF = 15; - * @return The iBJOJJBHKCF. + * uint32 DHIDKFLCKBF = 15; + * @return The dHIDKFLCKBF. */ - int getIBJOJJBHKCF(); + int getDHIDKFLCKBF(); } /** - * 
-   * Obf: DEIBBCOKCBE
-   *
- * * Protobuf type {@code FungusFighterV2SettleInfo} */ public static final class FungusFighterV2SettleInfo extends @@ -103,34 +99,34 @@ private FungusFighterV2SettleInfo( case 0: done = true; break; - case 24: { + case 8: { - oGOLIHBAJDL_ = input.readUInt32(); + isNewRecord_ = input.readBool(); break; } - case 48: { + case 16: { - levelId_ = input.readUInt32(); + jOFBEIACLOF_ = input.readUInt32(); break; } - case 64: { + case 40: { - isNewRecord_ = input.readBool(); + pJJAOILBFBN_ = input.readUInt32(); break; } - case 88: { + case 80: { - gOJKOCDIMEO_ = input.readUInt32(); + cFBLFKNOJIK_ = input.readUInt32(); break; } - case 104: { + case 88: { - costTime_ = input.readUInt32(); + eHGIJGCNHKL_ = input.readUInt32(); break; } case 120: { - iBJOJJBHKCF_ = input.readUInt32(); + dHIDKFLCKBF_ = input.readUInt32(); break; } default: { @@ -165,70 +161,70 @@ private FungusFighterV2SettleInfo( emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.class, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder.class); } - public static final int GOJKOCDIMEO_FIELD_NUMBER = 11; - private int gOJKOCDIMEO_; + public static final int IS_NEW_RECORD_FIELD_NUMBER = 1; + private boolean isNewRecord_; /** - * uint32 GOJKOCDIMEO = 11; - * @return The gOJKOCDIMEO. + * bool is_new_record = 1; + * @return The isNewRecord. */ @java.lang.Override - public int getGOJKOCDIMEO() { - return gOJKOCDIMEO_; + public boolean getIsNewRecord() { + return isNewRecord_; } - public static final int LEVEL_ID_FIELD_NUMBER = 6; - private int levelId_; + public static final int JOFBEIACLOF_FIELD_NUMBER = 2; + private int jOFBEIACLOF_; /** - * uint32 level_id = 6; - * @return The levelId. + * uint32 JOFBEIACLOF = 2; + * @return The jOFBEIACLOF. */ @java.lang.Override - public int getLevelId() { - return levelId_; + public int getJOFBEIACLOF() { + return jOFBEIACLOF_; } - public static final int OGOLIHBAJDL_FIELD_NUMBER = 3; - private int oGOLIHBAJDL_; + public static final int PJJAOILBFBN_FIELD_NUMBER = 5; + private int pJJAOILBFBN_; /** - * uint32 OGOLIHBAJDL = 3; - * @return The oGOLIHBAJDL. + * uint32 PJJAOILBFBN = 5; + * @return The pJJAOILBFBN. */ @java.lang.Override - public int getOGOLIHBAJDL() { - return oGOLIHBAJDL_; + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } - public static final int IS_NEW_RECORD_FIELD_NUMBER = 8; - private boolean isNewRecord_; + public static final int CFBLFKNOJIK_FIELD_NUMBER = 10; + private int cFBLFKNOJIK_; /** - * bool is_new_record = 8; - * @return The isNewRecord. + * uint32 CFBLFKNOJIK = 10; + * @return The cFBLFKNOJIK. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getCFBLFKNOJIK() { + return cFBLFKNOJIK_; } - public static final int COST_TIME_FIELD_NUMBER = 13; - private int costTime_; + public static final int EHGIJGCNHKL_FIELD_NUMBER = 11; + private int eHGIJGCNHKL_; /** - * uint32 cost_time = 13; - * @return The costTime. + * uint32 EHGIJGCNHKL = 11; + * @return The eHGIJGCNHKL. */ @java.lang.Override - public int getCostTime() { - return costTime_; + public int getEHGIJGCNHKL() { + return eHGIJGCNHKL_; } - public static final int IBJOJJBHKCF_FIELD_NUMBER = 15; - private int iBJOJJBHKCF_; + public static final int DHIDKFLCKBF_FIELD_NUMBER = 15; + private int dHIDKFLCKBF_; /** - * uint32 IBJOJJBHKCF = 15; - * @return The iBJOJJBHKCF. + * uint32 DHIDKFLCKBF = 15; + * @return The dHIDKFLCKBF. */ @java.lang.Override - public int getIBJOJJBHKCF() { - return iBJOJJBHKCF_; + public int getDHIDKFLCKBF() { + return dHIDKFLCKBF_; } private byte memoizedIsInitialized = -1; @@ -245,23 +241,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (oGOLIHBAJDL_ != 0) { - output.writeUInt32(3, oGOLIHBAJDL_); + if (isNewRecord_ != false) { + output.writeBool(1, isNewRecord_); } - if (levelId_ != 0) { - output.writeUInt32(6, levelId_); + if (jOFBEIACLOF_ != 0) { + output.writeUInt32(2, jOFBEIACLOF_); } - if (isNewRecord_ != false) { - output.writeBool(8, isNewRecord_); + if (pJJAOILBFBN_ != 0) { + output.writeUInt32(5, pJJAOILBFBN_); } - if (gOJKOCDIMEO_ != 0) { - output.writeUInt32(11, gOJKOCDIMEO_); + if (cFBLFKNOJIK_ != 0) { + output.writeUInt32(10, cFBLFKNOJIK_); } - if (costTime_ != 0) { - output.writeUInt32(13, costTime_); + if (eHGIJGCNHKL_ != 0) { + output.writeUInt32(11, eHGIJGCNHKL_); } - if (iBJOJJBHKCF_ != 0) { - output.writeUInt32(15, iBJOJJBHKCF_); + if (dHIDKFLCKBF_ != 0) { + output.writeUInt32(15, dHIDKFLCKBF_); } unknownFields.writeTo(output); } @@ -272,29 +268,29 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (oGOLIHBAJDL_ != 0) { + if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, oGOLIHBAJDL_); + .computeBoolSize(1, isNewRecord_); } - if (levelId_ != 0) { + if (jOFBEIACLOF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, levelId_); + .computeUInt32Size(2, jOFBEIACLOF_); } - if (isNewRecord_ != false) { + if (pJJAOILBFBN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(8, isNewRecord_); + .computeUInt32Size(5, pJJAOILBFBN_); } - if (gOJKOCDIMEO_ != 0) { + if (cFBLFKNOJIK_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, gOJKOCDIMEO_); + .computeUInt32Size(10, cFBLFKNOJIK_); } - if (costTime_ != 0) { + if (eHGIJGCNHKL_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, costTime_); + .computeUInt32Size(11, eHGIJGCNHKL_); } - if (iBJOJJBHKCF_ != 0) { + if (dHIDKFLCKBF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, iBJOJJBHKCF_); + .computeUInt32Size(15, dHIDKFLCKBF_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -311,18 +307,18 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo other = (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) obj; - if (getGOJKOCDIMEO() - != other.getGOJKOCDIMEO()) return false; - if (getLevelId() - != other.getLevelId()) return false; - if (getOGOLIHBAJDL() - != other.getOGOLIHBAJDL()) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; - if (getCostTime() - != other.getCostTime()) return false; - if (getIBJOJJBHKCF() - != other.getIBJOJJBHKCF()) return false; + if (getJOFBEIACLOF() + != other.getJOFBEIACLOF()) return false; + if (getPJJAOILBFBN() + != other.getPJJAOILBFBN()) return false; + if (getCFBLFKNOJIK() + != other.getCFBLFKNOJIK()) return false; + if (getEHGIJGCNHKL() + != other.getEHGIJGCNHKL()) return false; + if (getDHIDKFLCKBF() + != other.getDHIDKFLCKBF()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -334,19 +330,19 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + GOJKOCDIMEO_FIELD_NUMBER; - hash = (53 * hash) + getGOJKOCDIMEO(); - hash = (37 * hash) + LEVEL_ID_FIELD_NUMBER; - hash = (53 * hash) + getLevelId(); - hash = (37 * hash) + OGOLIHBAJDL_FIELD_NUMBER; - hash = (53 * hash) + getOGOLIHBAJDL(); hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); - hash = (37 * hash) + COST_TIME_FIELD_NUMBER; - hash = (53 * hash) + getCostTime(); - hash = (37 * hash) + IBJOJJBHKCF_FIELD_NUMBER; - hash = (53 * hash) + getIBJOJJBHKCF(); + hash = (37 * hash) + JOFBEIACLOF_FIELD_NUMBER; + hash = (53 * hash) + getJOFBEIACLOF(); + hash = (37 * hash) + PJJAOILBFBN_FIELD_NUMBER; + hash = (53 * hash) + getPJJAOILBFBN(); + hash = (37 * hash) + CFBLFKNOJIK_FIELD_NUMBER; + hash = (53 * hash) + getCFBLFKNOJIK(); + hash = (37 * hash) + EHGIJGCNHKL_FIELD_NUMBER; + hash = (53 * hash) + getEHGIJGCNHKL(); + hash = (37 * hash) + DHIDKFLCKBF_FIELD_NUMBER; + hash = (53 * hash) + getDHIDKFLCKBF(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -443,10 +439,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: DEIBBCOKCBE
-     *
- * * Protobuf type {@code FungusFighterV2SettleInfo} */ public static final class Builder extends @@ -484,17 +476,17 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - gOJKOCDIMEO_ = 0; + isNewRecord_ = false; - levelId_ = 0; + jOFBEIACLOF_ = 0; - oGOLIHBAJDL_ = 0; + pJJAOILBFBN_ = 0; - isNewRecord_ = false; + cFBLFKNOJIK_ = 0; - costTime_ = 0; + eHGIJGCNHKL_ = 0; - iBJOJJBHKCF_ = 0; + dHIDKFLCKBF_ = 0; return this; } @@ -522,12 +514,12 @@ public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFight @java.lang.Override public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo buildPartial() { emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo result = new emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo(this); - result.gOJKOCDIMEO_ = gOJKOCDIMEO_; - result.levelId_ = levelId_; - result.oGOLIHBAJDL_ = oGOLIHBAJDL_; result.isNewRecord_ = isNewRecord_; - result.costTime_ = costTime_; - result.iBJOJJBHKCF_ = iBJOJJBHKCF_; + result.jOFBEIACLOF_ = jOFBEIACLOF_; + result.pJJAOILBFBN_ = pJJAOILBFBN_; + result.cFBLFKNOJIK_ = cFBLFKNOJIK_; + result.eHGIJGCNHKL_ = eHGIJGCNHKL_; + result.dHIDKFLCKBF_ = dHIDKFLCKBF_; onBuilt(); return result; } @@ -576,23 +568,23 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo other) { if (other == emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance()) return this; - if (other.getGOJKOCDIMEO() != 0) { - setGOJKOCDIMEO(other.getGOJKOCDIMEO()); + if (other.getIsNewRecord() != false) { + setIsNewRecord(other.getIsNewRecord()); } - if (other.getLevelId() != 0) { - setLevelId(other.getLevelId()); + if (other.getJOFBEIACLOF() != 0) { + setJOFBEIACLOF(other.getJOFBEIACLOF()); } - if (other.getOGOLIHBAJDL() != 0) { - setOGOLIHBAJDL(other.getOGOLIHBAJDL()); + if (other.getPJJAOILBFBN() != 0) { + setPJJAOILBFBN(other.getPJJAOILBFBN()); } - if (other.getIsNewRecord() != false) { - setIsNewRecord(other.getIsNewRecord()); + if (other.getCFBLFKNOJIK() != 0) { + setCFBLFKNOJIK(other.getCFBLFKNOJIK()); } - if (other.getCostTime() != 0) { - setCostTime(other.getCostTime()); + if (other.getEHGIJGCNHKL() != 0) { + setEHGIJGCNHKL(other.getEHGIJGCNHKL()); } - if (other.getIBJOJJBHKCF() != 0) { - setIBJOJJBHKCF(other.getIBJOJJBHKCF()); + if (other.getDHIDKFLCKBF() != 0) { + setDHIDKFLCKBF(other.getDHIDKFLCKBF()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -623,188 +615,188 @@ public Builder mergeFrom( return this; } - private int gOJKOCDIMEO_ ; + private boolean isNewRecord_ ; /** - * uint32 GOJKOCDIMEO = 11; - * @return The gOJKOCDIMEO. + * bool is_new_record = 1; + * @return The isNewRecord. */ @java.lang.Override - public int getGOJKOCDIMEO() { - return gOJKOCDIMEO_; + public boolean getIsNewRecord() { + return isNewRecord_; } /** - * uint32 GOJKOCDIMEO = 11; - * @param value The gOJKOCDIMEO to set. + * bool is_new_record = 1; + * @param value The isNewRecord to set. * @return This builder for chaining. */ - public Builder setGOJKOCDIMEO(int value) { + public Builder setIsNewRecord(boolean value) { - gOJKOCDIMEO_ = value; + isNewRecord_ = value; onChanged(); return this; } /** - * uint32 GOJKOCDIMEO = 11; + * bool is_new_record = 1; * @return This builder for chaining. */ - public Builder clearGOJKOCDIMEO() { + public Builder clearIsNewRecord() { - gOJKOCDIMEO_ = 0; + isNewRecord_ = false; onChanged(); return this; } - private int levelId_ ; + private int jOFBEIACLOF_ ; /** - * uint32 level_id = 6; - * @return The levelId. + * uint32 JOFBEIACLOF = 2; + * @return The jOFBEIACLOF. */ @java.lang.Override - public int getLevelId() { - return levelId_; + public int getJOFBEIACLOF() { + return jOFBEIACLOF_; } /** - * uint32 level_id = 6; - * @param value The levelId to set. + * uint32 JOFBEIACLOF = 2; + * @param value The jOFBEIACLOF to set. * @return This builder for chaining. */ - public Builder setLevelId(int value) { + public Builder setJOFBEIACLOF(int value) { - levelId_ = value; + jOFBEIACLOF_ = value; onChanged(); return this; } /** - * uint32 level_id = 6; + * uint32 JOFBEIACLOF = 2; * @return This builder for chaining. */ - public Builder clearLevelId() { + public Builder clearJOFBEIACLOF() { - levelId_ = 0; + jOFBEIACLOF_ = 0; onChanged(); return this; } - private int oGOLIHBAJDL_ ; + private int pJJAOILBFBN_ ; /** - * uint32 OGOLIHBAJDL = 3; - * @return The oGOLIHBAJDL. + * uint32 PJJAOILBFBN = 5; + * @return The pJJAOILBFBN. */ @java.lang.Override - public int getOGOLIHBAJDL() { - return oGOLIHBAJDL_; + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } /** - * uint32 OGOLIHBAJDL = 3; - * @param value The oGOLIHBAJDL to set. + * uint32 PJJAOILBFBN = 5; + * @param value The pJJAOILBFBN to set. * @return This builder for chaining. */ - public Builder setOGOLIHBAJDL(int value) { + public Builder setPJJAOILBFBN(int value) { - oGOLIHBAJDL_ = value; + pJJAOILBFBN_ = value; onChanged(); return this; } /** - * uint32 OGOLIHBAJDL = 3; + * uint32 PJJAOILBFBN = 5; * @return This builder for chaining. */ - public Builder clearOGOLIHBAJDL() { + public Builder clearPJJAOILBFBN() { - oGOLIHBAJDL_ = 0; + pJJAOILBFBN_ = 0; onChanged(); return this; } - private boolean isNewRecord_ ; + private int cFBLFKNOJIK_ ; /** - * bool is_new_record = 8; - * @return The isNewRecord. + * uint32 CFBLFKNOJIK = 10; + * @return The cFBLFKNOJIK. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getCFBLFKNOJIK() { + return cFBLFKNOJIK_; } /** - * bool is_new_record = 8; - * @param value The isNewRecord to set. + * uint32 CFBLFKNOJIK = 10; + * @param value The cFBLFKNOJIK to set. * @return This builder for chaining. */ - public Builder setIsNewRecord(boolean value) { + public Builder setCFBLFKNOJIK(int value) { - isNewRecord_ = value; + cFBLFKNOJIK_ = value; onChanged(); return this; } /** - * bool is_new_record = 8; + * uint32 CFBLFKNOJIK = 10; * @return This builder for chaining. */ - public Builder clearIsNewRecord() { + public Builder clearCFBLFKNOJIK() { - isNewRecord_ = false; + cFBLFKNOJIK_ = 0; onChanged(); return this; } - private int costTime_ ; + private int eHGIJGCNHKL_ ; /** - * uint32 cost_time = 13; - * @return The costTime. + * uint32 EHGIJGCNHKL = 11; + * @return The eHGIJGCNHKL. */ @java.lang.Override - public int getCostTime() { - return costTime_; + public int getEHGIJGCNHKL() { + return eHGIJGCNHKL_; } /** - * uint32 cost_time = 13; - * @param value The costTime to set. + * uint32 EHGIJGCNHKL = 11; + * @param value The eHGIJGCNHKL to set. * @return This builder for chaining. */ - public Builder setCostTime(int value) { + public Builder setEHGIJGCNHKL(int value) { - costTime_ = value; + eHGIJGCNHKL_ = value; onChanged(); return this; } /** - * uint32 cost_time = 13; + * uint32 EHGIJGCNHKL = 11; * @return This builder for chaining. */ - public Builder clearCostTime() { + public Builder clearEHGIJGCNHKL() { - costTime_ = 0; + eHGIJGCNHKL_ = 0; onChanged(); return this; } - private int iBJOJJBHKCF_ ; + private int dHIDKFLCKBF_ ; /** - * uint32 IBJOJJBHKCF = 15; - * @return The iBJOJJBHKCF. + * uint32 DHIDKFLCKBF = 15; + * @return The dHIDKFLCKBF. */ @java.lang.Override - public int getIBJOJJBHKCF() { - return iBJOJJBHKCF_; + public int getDHIDKFLCKBF() { + return dHIDKFLCKBF_; } /** - * uint32 IBJOJJBHKCF = 15; - * @param value The iBJOJJBHKCF to set. + * uint32 DHIDKFLCKBF = 15; + * @param value The dHIDKFLCKBF to set. * @return This builder for chaining. */ - public Builder setIBJOJJBHKCF(int value) { + public Builder setDHIDKFLCKBF(int value) { - iBJOJJBHKCF_ = value; + dHIDKFLCKBF_ = value; onChanged(); return this; } /** - * uint32 IBJOJJBHKCF = 15; + * uint32 DHIDKFLCKBF = 15; * @return This builder for chaining. */ - public Builder clearIBJOJJBHKCF() { + public Builder clearDHIDKFLCKBF() { - iBJOJJBHKCF_ = 0; + dHIDKFLCKBF_ = 0; onChanged(); return this; } @@ -875,12 +867,12 @@ public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFight descriptor; static { java.lang.String[] descriptorData = { - "\n\037FungusFighterV2SettleInfo.proto\"\226\001\n\031Fu" + - "ngusFighterV2SettleInfo\022\023\n\013GOJKOCDIMEO\030\013" + - " \001(\r\022\020\n\010level_id\030\006 \001(\r\022\023\n\013OGOLIHBAJDL\030\003 " + - "\001(\r\022\025\n\ris_new_record\030\010 \001(\010\022\021\n\tcost_time\030" + - "\r \001(\r\022\023\n\013IBJOJJBHKCF\030\017 \001(\rB\033\n\031emu.grassc" + - "utter.net.protob\006proto3" + "\n\037FungusFighterV2SettleInfo.proto\"\233\001\n\031Fu" + + "ngusFighterV2SettleInfo\022\025\n\ris_new_record" + + "\030\001 \001(\010\022\023\n\013JOFBEIACLOF\030\002 \001(\r\022\023\n\013PJJAOILBF" + + "BN\030\005 \001(\r\022\023\n\013CFBLFKNOJIK\030\n \001(\r\022\023\n\013EHGIJGC" + + "NHKL\030\013 \001(\r\022\023\n\013DHIDKFLCKBF\030\017 \001(\rB\033\n\031emu.g" + + "rasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -891,7 +883,7 @@ public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFight internal_static_FungusFighterV2SettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_FungusFighterV2SettleInfo_descriptor, - new java.lang.String[] { "GOJKOCDIMEO", "LevelId", "OGOLIHBAJDL", "IsNewRecord", "CostTime", "IBJOJJBHKCF", }); + new java.lang.String[] { "IsNewRecord", "JOFBEIACLOF", "PJJAOILBFBN", "CFBLFKNOJIK", "EHGIJGCNHKL", "DHIDKFLCKBF", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeDataOuterClass.java index b2bbb641e84..90fed1d2e67 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeDataOuterClass.java @@ -19,13 +19,13 @@ public interface FurnitureMakeDataOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 durTime = 14; - * @return The durTime. + * uint32 index = 1; + * @return The index. */ - int getDurTime(); + int getIndex(); /** - * fixed32 accelerateTime = 15; + * fixed32 accelerateTime = 6; * @return The accelerateTime. */ int getAccelerateTime(); @@ -37,26 +37,26 @@ public interface FurnitureMakeDataOrBuilder extends int getMakeId(); /** - * uint32 avatar_id = 10; - * @return The avatarId. + * uint32 durTime = 11; + * @return The durTime. */ - int getAvatarId(); + int getDurTime(); /** - * uint32 index = 12; - * @return The index. + * uint32 avatar_id = 12; + * @return The avatarId. */ - int getIndex(); + int getAvatarId(); /** - * fixed32 begin_time = 1; + * fixed32 begin_time = 15; * @return The beginTime. */ int getBeginTime(); } /** * 
-   * Obf: OLNPKHEMJEN
+   * obf: IMHFMHCLNEE
    *
* * Protobuf type {@code FurnitureMakeData} @@ -103,34 +103,34 @@ private FurnitureMakeData( case 0: done = true; break; - case 13: { + case 8: { - beginTime_ = input.readFixed32(); + index_ = input.readUInt32(); break; } - case 56: { + case 53: { - makeId_ = input.readUInt32(); + accelerateTime_ = input.readFixed32(); break; } - case 80: { + case 56: { - avatarId_ = input.readUInt32(); + makeId_ = input.readUInt32(); break; } - case 96: { + case 88: { - index_ = input.readUInt32(); + durTime_ = input.readUInt32(); break; } - case 112: { + case 96: { - durTime_ = input.readUInt32(); + avatarId_ = input.readUInt32(); break; } case 125: { - accelerateTime_ = input.readFixed32(); + beginTime_ = input.readFixed32(); break; } default: { @@ -165,21 +165,21 @@ private FurnitureMakeData( emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.class, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder.class); } - public static final int DURTIME_FIELD_NUMBER = 14; - private int durTime_; + public static final int INDEX_FIELD_NUMBER = 1; + private int index_; /** - * uint32 durTime = 14; - * @return The durTime. + * uint32 index = 1; + * @return The index. */ @java.lang.Override - public int getDurTime() { - return durTime_; + public int getIndex() { + return index_; } - public static final int ACCELERATETIME_FIELD_NUMBER = 15; + public static final int ACCELERATETIME_FIELD_NUMBER = 6; private int accelerateTime_; /** - * fixed32 accelerateTime = 15; + * fixed32 accelerateTime = 6; * @return The accelerateTime. */ @java.lang.Override @@ -198,32 +198,32 @@ public int getMakeId() { return makeId_; } - public static final int AVATAR_ID_FIELD_NUMBER = 10; - private int avatarId_; + public static final int DURTIME_FIELD_NUMBER = 11; + private int durTime_; /** - * uint32 avatar_id = 10; - * @return The avatarId. + * uint32 durTime = 11; + * @return The durTime. */ @java.lang.Override - public int getAvatarId() { - return avatarId_; + public int getDurTime() { + return durTime_; } - public static final int INDEX_FIELD_NUMBER = 12; - private int index_; + public static final int AVATAR_ID_FIELD_NUMBER = 12; + private int avatarId_; /** - * uint32 index = 12; - * @return The index. + * uint32 avatar_id = 12; + * @return The avatarId. */ @java.lang.Override - public int getIndex() { - return index_; + public int getAvatarId() { + return avatarId_; } - public static final int BEGIN_TIME_FIELD_NUMBER = 1; + public static final int BEGIN_TIME_FIELD_NUMBER = 15; private int beginTime_; /** - * fixed32 begin_time = 1; + * fixed32 begin_time = 15; * @return The beginTime. */ @java.lang.Override @@ -245,23 +245,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (beginTime_ != 0) { - output.writeFixed32(1, beginTime_); + if (index_ != 0) { + output.writeUInt32(1, index_); + } + if (accelerateTime_ != 0) { + output.writeFixed32(6, accelerateTime_); } if (makeId_ != 0) { output.writeUInt32(7, makeId_); } - if (avatarId_ != 0) { - output.writeUInt32(10, avatarId_); - } - if (index_ != 0) { - output.writeUInt32(12, index_); - } if (durTime_ != 0) { - output.writeUInt32(14, durTime_); + output.writeUInt32(11, durTime_); } - if (accelerateTime_ != 0) { - output.writeFixed32(15, accelerateTime_); + if (avatarId_ != 0) { + output.writeUInt32(12, avatarId_); + } + if (beginTime_ != 0) { + output.writeFixed32(15, beginTime_); } unknownFields.writeTo(output); } @@ -272,29 +272,29 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (beginTime_ != 0) { + if (index_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeFixed32Size(1, beginTime_); + .computeUInt32Size(1, index_); } - if (makeId_ != 0) { + if (accelerateTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, makeId_); + .computeFixed32Size(6, accelerateTime_); } - if (avatarId_ != 0) { + if (makeId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, avatarId_); + .computeUInt32Size(7, makeId_); } - if (index_ != 0) { + if (durTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, index_); + .computeUInt32Size(11, durTime_); } - if (durTime_ != 0) { + if (avatarId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, durTime_); + .computeUInt32Size(12, avatarId_); } - if (accelerateTime_ != 0) { + if (beginTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeFixed32Size(15, accelerateTime_); + .computeFixed32Size(15, beginTime_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -311,16 +311,16 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData other = (emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData) obj; - if (getDurTime() - != other.getDurTime()) return false; + if (getIndex() + != other.getIndex()) return false; if (getAccelerateTime() != other.getAccelerateTime()) return false; if (getMakeId() != other.getMakeId()) return false; + if (getDurTime() + != other.getDurTime()) return false; if (getAvatarId() != other.getAvatarId()) return false; - if (getIndex() - != other.getIndex()) return false; if (getBeginTime() != other.getBeginTime()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -334,16 +334,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + DURTIME_FIELD_NUMBER; - hash = (53 * hash) + getDurTime(); + hash = (37 * hash) + INDEX_FIELD_NUMBER; + hash = (53 * hash) + getIndex(); hash = (37 * hash) + ACCELERATETIME_FIELD_NUMBER; hash = (53 * hash) + getAccelerateTime(); hash = (37 * hash) + MAKE_ID_FIELD_NUMBER; hash = (53 * hash) + getMakeId(); + hash = (37 * hash) + DURTIME_FIELD_NUMBER; + hash = (53 * hash) + getDurTime(); hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; hash = (53 * hash) + getAvatarId(); - hash = (37 * hash) + INDEX_FIELD_NUMBER; - hash = (53 * hash) + getIndex(); hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER; hash = (53 * hash) + getBeginTime(); hash = (29 * hash) + unknownFields.hashCode(); @@ -443,7 +443,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: OLNPKHEMJEN
+     * obf: IMHFMHCLNEE
      *
* * Protobuf type {@code FurnitureMakeData} @@ -483,15 +483,15 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - durTime_ = 0; + index_ = 0; accelerateTime_ = 0; makeId_ = 0; - avatarId_ = 0; + durTime_ = 0; - index_ = 0; + avatarId_ = 0; beginTime_ = 0; @@ -521,11 +521,11 @@ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData b @java.lang.Override public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData buildPartial() { emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData result = new emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData(this); - result.durTime_ = durTime_; + result.index_ = index_; result.accelerateTime_ = accelerateTime_; result.makeId_ = makeId_; + result.durTime_ = durTime_; result.avatarId_ = avatarId_; - result.index_ = index_; result.beginTime_ = beginTime_; onBuilt(); return result; @@ -575,8 +575,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData other) { if (other == emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.getDefaultInstance()) return this; - if (other.getDurTime() != 0) { - setDurTime(other.getDurTime()); + if (other.getIndex() != 0) { + setIndex(other.getIndex()); } if (other.getAccelerateTime() != 0) { setAccelerateTime(other.getAccelerateTime()); @@ -584,12 +584,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.F if (other.getMakeId() != 0) { setMakeId(other.getMakeId()); } + if (other.getDurTime() != 0) { + setDurTime(other.getDurTime()); + } if (other.getAvatarId() != 0) { setAvatarId(other.getAvatarId()); } - if (other.getIndex() != 0) { - setIndex(other.getIndex()); - } if (other.getBeginTime() != 0) { setBeginTime(other.getBeginTime()); } @@ -622,40 +622,40 @@ public Builder mergeFrom( return this; } - private int durTime_ ; + private int index_ ; /** - * uint32 durTime = 14; - * @return The durTime. + * uint32 index = 1; + * @return The index. */ @java.lang.Override - public int getDurTime() { - return durTime_; + public int getIndex() { + return index_; } /** - * uint32 durTime = 14; - * @param value The durTime to set. + * uint32 index = 1; + * @param value The index to set. * @return This builder for chaining. */ - public Builder setDurTime(int value) { + public Builder setIndex(int value) { - durTime_ = value; + index_ = value; onChanged(); return this; } /** - * uint32 durTime = 14; + * uint32 index = 1; * @return This builder for chaining. */ - public Builder clearDurTime() { + public Builder clearIndex() { - durTime_ = 0; + index_ = 0; onChanged(); return this; } private int accelerateTime_ ; /** - * fixed32 accelerateTime = 15; + * fixed32 accelerateTime = 6; * @return The accelerateTime. */ @java.lang.Override @@ -663,7 +663,7 @@ public int getAccelerateTime() { return accelerateTime_; } /** - * fixed32 accelerateTime = 15; + * fixed32 accelerateTime = 6; * @param value The accelerateTime to set. * @return This builder for chaining. */ @@ -674,7 +674,7 @@ public Builder setAccelerateTime(int value) { return this; } /** - * fixed32 accelerateTime = 15; + * fixed32 accelerateTime = 6; * @return This builder for chaining. */ public Builder clearAccelerateTime() { @@ -715,71 +715,71 @@ public Builder clearMakeId() { return this; } - private int avatarId_ ; + private int durTime_ ; /** - * uint32 avatar_id = 10; - * @return The avatarId. + * uint32 durTime = 11; + * @return The durTime. */ @java.lang.Override - public int getAvatarId() { - return avatarId_; + public int getDurTime() { + return durTime_; } /** - * uint32 avatar_id = 10; - * @param value The avatarId to set. + * uint32 durTime = 11; + * @param value The durTime to set. * @return This builder for chaining. */ - public Builder setAvatarId(int value) { + public Builder setDurTime(int value) { - avatarId_ = value; + durTime_ = value; onChanged(); return this; } /** - * uint32 avatar_id = 10; + * uint32 durTime = 11; * @return This builder for chaining. */ - public Builder clearAvatarId() { + public Builder clearDurTime() { - avatarId_ = 0; + durTime_ = 0; onChanged(); return this; } - private int index_ ; + private int avatarId_ ; /** - * uint32 index = 12; - * @return The index. + * uint32 avatar_id = 12; + * @return The avatarId. */ @java.lang.Override - public int getIndex() { - return index_; + public int getAvatarId() { + return avatarId_; } /** - * uint32 index = 12; - * @param value The index to set. + * uint32 avatar_id = 12; + * @param value The avatarId to set. * @return This builder for chaining. */ - public Builder setIndex(int value) { + public Builder setAvatarId(int value) { - index_ = value; + avatarId_ = value; onChanged(); return this; } /** - * uint32 index = 12; + * uint32 avatar_id = 12; * @return This builder for chaining. */ - public Builder clearIndex() { + public Builder clearAvatarId() { - index_ = 0; + avatarId_ = 0; onChanged(); return this; } private int beginTime_ ; /** - * fixed32 begin_time = 1; + * fixed32 begin_time = 15; * @return The beginTime. */ @java.lang.Override @@ -787,7 +787,7 @@ public int getBeginTime() { return beginTime_; } /** - * fixed32 begin_time = 1; + * fixed32 begin_time = 15; * @param value The beginTime to set. * @return This builder for chaining. */ @@ -798,7 +798,7 @@ public Builder setBeginTime(int value) { return this; } /** - * fixed32 begin_time = 1; + * fixed32 begin_time = 15; * @return This builder for chaining. */ public Builder clearBeginTime() { @@ -875,9 +875,9 @@ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData g static { java.lang.String[] descriptorData = { "\n\027FurnitureMakeData.proto\"\203\001\n\021FurnitureM" + - "akeData\022\017\n\007durTime\030\016 \001(\r\022\026\n\016accelerateTi" + - "me\030\017 \001(\007\022\017\n\007make_id\030\007 \001(\r\022\021\n\tavatar_id\030\n" + - " \001(\r\022\r\n\005index\030\014 \001(\r\022\022\n\nbegin_time\030\001 \001(\007B" + + "akeData\022\r\n\005index\030\001 \001(\r\022\026\n\016accelerateTime" + + "\030\006 \001(\007\022\017\n\007make_id\030\007 \001(\r\022\017\n\007durTime\030\013 \001(\r" + + "\022\021\n\tavatar_id\030\014 \001(\r\022\022\n\nbegin_time\030\017 \001(\007B" + "\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -889,7 +889,7 @@ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData g internal_static_FurnitureMakeData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_FurnitureMakeData_descriptor, - new java.lang.String[] { "DurTime", "AccelerateTime", "MakeId", "AvatarId", "Index", "BeginTime", }); + new java.lang.String[] { "Index", "AccelerateTime", "MakeId", "DurTime", "AvatarId", "BeginTime", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeSlotOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeSlotOuterClass.java index dcd73df540c..961339f6863 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeSlotOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeSlotOuterClass.java @@ -19,32 +19,32 @@ public interface FurnitureMakeSlotOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ java.util.List getFurnitureMakeDataListList(); /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData getFurnitureMakeDataList(int index); /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ int getFurnitureMakeDataListCount(); /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ java.util.List getFurnitureMakeDataListOrBuilderList(); /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeDataOrBuilder getFurnitureMakeDataListOrBuilder( int index); } /** * 
-   * Obf: GINIMPCEHMA
+   * obf: JCBAIFPFACC
    *
* * Protobuf type {@code FurnitureMakeSlot} @@ -93,7 +93,7 @@ private FurnitureMakeSlot( case 0: done = true; break; - case 58: { + case 66: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { furnitureMakeDataList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -137,17 +137,17 @@ private FurnitureMakeSlot( emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.class, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder.class); } - public static final int FURNITURE_MAKE_DATA_LIST_FIELD_NUMBER = 7; + public static final int FURNITURE_MAKE_DATA_LIST_FIELD_NUMBER = 8; private java.util.List furnitureMakeDataList_; /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ @java.lang.Override public java.util.List getFurnitureMakeDataListList() { return furnitureMakeDataList_; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ @java.lang.Override public java.util.List @@ -155,21 +155,21 @@ public java.util.Listrepeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ @java.lang.Override public int getFurnitureMakeDataListCount() { return furnitureMakeDataList_.size(); } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData getFurnitureMakeDataList(int index) { return furnitureMakeDataList_.get(index); } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeDataOrBuilder getFurnitureMakeDataListOrBuilder( @@ -192,7 +192,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < furnitureMakeDataList_.size(); i++) { - output.writeMessage(7, furnitureMakeDataList_.get(i)); + output.writeMessage(8, furnitureMakeDataList_.get(i)); } unknownFields.writeTo(output); } @@ -205,7 +205,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < furnitureMakeDataList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, furnitureMakeDataList_.get(i)); + .computeMessageSize(8, furnitureMakeDataList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -336,7 +336,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: GINIMPCEHMA
+     * obf: JCBAIFPFACC
      *
* * Protobuf type {@code FurnitureMakeSlot} @@ -536,7 +536,7 @@ private void ensureFurnitureMakeDataListIsMutable() { emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeDataOrBuilder> furnitureMakeDataListBuilder_; /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public java.util.List getFurnitureMakeDataListList() { if (furnitureMakeDataListBuilder_ == null) { @@ -546,7 +546,7 @@ public java.util.Listrepeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public int getFurnitureMakeDataListCount() { if (furnitureMakeDataListBuilder_ == null) { @@ -556,7 +556,7 @@ public int getFurnitureMakeDataListCount() { } } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData getFurnitureMakeDataList(int index) { if (furnitureMakeDataListBuilder_ == null) { @@ -566,7 +566,7 @@ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData g } } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder setFurnitureMakeDataList( int index, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData value) { @@ -583,7 +583,7 @@ public Builder setFurnitureMakeDataList( return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder setFurnitureMakeDataList( int index, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder builderForValue) { @@ -597,7 +597,7 @@ public Builder setFurnitureMakeDataList( return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder addFurnitureMakeDataList(emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData value) { if (furnitureMakeDataListBuilder_ == null) { @@ -613,7 +613,7 @@ public Builder addFurnitureMakeDataList(emu.grasscutter.net.proto.FurnitureMakeD return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder addFurnitureMakeDataList( int index, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData value) { @@ -630,7 +630,7 @@ public Builder addFurnitureMakeDataList( return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder addFurnitureMakeDataList( emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder builderForValue) { @@ -644,7 +644,7 @@ public Builder addFurnitureMakeDataList( return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder addFurnitureMakeDataList( int index, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder builderForValue) { @@ -658,7 +658,7 @@ public Builder addFurnitureMakeDataList( return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder addAllFurnitureMakeDataList( java.lang.Iterable values) { @@ -673,7 +673,7 @@ public Builder addAllFurnitureMakeDataList( return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder clearFurnitureMakeDataList() { if (furnitureMakeDataListBuilder_ == null) { @@ -686,7 +686,7 @@ public Builder clearFurnitureMakeDataList() { return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public Builder removeFurnitureMakeDataList(int index) { if (furnitureMakeDataListBuilder_ == null) { @@ -699,14 +699,14 @@ public Builder removeFurnitureMakeDataList(int index) { return this; } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder getFurnitureMakeDataListBuilder( int index) { return getFurnitureMakeDataListFieldBuilder().getBuilder(index); } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeDataOrBuilder getFurnitureMakeDataListOrBuilder( int index) { @@ -716,7 +716,7 @@ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeDataOr } } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public java.util.List getFurnitureMakeDataListOrBuilderList() { @@ -727,14 +727,14 @@ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeDataOr } } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder addFurnitureMakeDataListBuilder() { return getFurnitureMakeDataListFieldBuilder().addBuilder( emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.getDefaultInstance()); } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.Builder addFurnitureMakeDataListBuilder( int index) { @@ -742,7 +742,7 @@ public emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.B index, emu.grasscutter.net.proto.FurnitureMakeDataOuterClass.FurnitureMakeData.getDefaultInstance()); } /** - * repeated .FurnitureMakeData furniture_make_data_list = 7; + * repeated .FurnitureMakeData furniture_make_data_list = 8; */ public java.util.List getFurnitureMakeDataListBuilderList() { @@ -831,7 +831,7 @@ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot g java.lang.String[] descriptorData = { "\n\027FurnitureMakeSlot.proto\032\027FurnitureMake" + "Data.proto\"I\n\021FurnitureMakeSlot\0224\n\030furni" + - "ture_make_data_list\030\007 \003(\0132\022.FurnitureMak" + + "ture_make_data_list\030\010 \003(\0132\022.FurnitureMak" + "eDataB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeStartRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeStartRspOuterClass.java index 8d3ed9d567d..b2b2c2873c5 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeStartRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeStartRspOuterClass.java @@ -19,30 +19,29 @@ public interface FurnitureMakeStartRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 1; - * @return The retcode. - */ - int getRetcode(); - - /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; * @return Whether the furnitureMakeSlot field is set. */ boolean hasFurnitureMakeSlot(); /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; * @return The furnitureMakeSlot. */ emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot getFurnitureMakeSlot(); /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder(); + + /** + * int32 retcode = 8; + * @return The retcode. + */ + int getRetcode(); } /** * 
-   * CmdId: 21400
-   * Obf: BBEDDELOBIC
+   * CmdId: 29740
    *
* * Protobuf type {@code FurnitureMakeStartRsp} @@ -89,12 +88,7 @@ private FurnitureMakeStartRsp( case 0: done = true; break; - case 8: { - - retcode_ = input.readInt32(); - break; - } - case 50: { + case 42: { emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder subBuilder = null; if (furnitureMakeSlot_ != null) { subBuilder = furnitureMakeSlot_.toBuilder(); @@ -107,6 +101,11 @@ private FurnitureMakeStartRsp( break; } + case 64: { + + retcode_ = input.readInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -139,21 +138,10 @@ private FurnitureMakeStartRsp( emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp.class, emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 1; - private int retcode_; - /** - * int32 retcode = 1; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int FURNITURE_MAKE_SLOT_FIELD_NUMBER = 6; + public static final int FURNITURE_MAKE_SLOT_FIELD_NUMBER = 5; private emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot furnitureMakeSlot_; /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; * @return Whether the furnitureMakeSlot field is set. */ @java.lang.Override @@ -161,7 +149,7 @@ public boolean hasFurnitureMakeSlot() { return furnitureMakeSlot_ != null; } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; * @return The furnitureMakeSlot. */ @java.lang.Override @@ -169,13 +157,24 @@ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot g return furnitureMakeSlot_ == null ? emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.getDefaultInstance() : furnitureMakeSlot_; } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ @java.lang.Override public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder() { return getFurnitureMakeSlot(); } + public static final int RETCODE_FIELD_NUMBER = 8; + private int retcode_; + /** + * int32 retcode = 8; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -190,11 +189,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (retcode_ != 0) { - output.writeInt32(1, retcode_); - } if (furnitureMakeSlot_ != null) { - output.writeMessage(6, getFurnitureMakeSlot()); + output.writeMessage(5, getFurnitureMakeSlot()); + } + if (retcode_ != 0) { + output.writeInt32(8, retcode_); } unknownFields.writeTo(output); } @@ -205,13 +204,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { + if (furnitureMakeSlot_ != null) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, retcode_); + .computeMessageSize(5, getFurnitureMakeSlot()); } - if (furnitureMakeSlot_ != null) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, getFurnitureMakeSlot()); + .computeInt32Size(8, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -228,13 +227,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp other = (emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; if (hasFurnitureMakeSlot() != other.hasFurnitureMakeSlot()) return false; if (hasFurnitureMakeSlot()) { if (!getFurnitureMakeSlot() .equals(other.getFurnitureMakeSlot())) return false; } + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -246,12 +245,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); if (hasFurnitureMakeSlot()) { hash = (37 * hash) + FURNITURE_MAKE_SLOT_FIELD_NUMBER; hash = (53 * hash) + getFurnitureMakeSlot().hashCode(); } + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -349,8 +348,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 21400
-     * Obf: BBEDDELOBIC
+     * CmdId: 29740
      *
* * Protobuf type {@code FurnitureMakeStartRsp} @@ -390,14 +388,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; - if (furnitureMakeSlotBuilder_ == null) { furnitureMakeSlot_ = null; } else { furnitureMakeSlot_ = null; furnitureMakeSlotBuilder_ = null; } + retcode_ = 0; + return this; } @@ -424,12 +422,12 @@ public emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeSt @java.lang.Override public emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp buildPartial() { emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp result = new emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp(this); - result.retcode_ = retcode_; if (furnitureMakeSlotBuilder_ == null) { result.furnitureMakeSlot_ = furnitureMakeSlot_; } else { result.furnitureMakeSlot_ = furnitureMakeSlotBuilder_.build(); } + result.retcode_ = retcode_; onBuilt(); return result; } @@ -478,12 +476,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp other) { if (other == emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeStartRsp.getDefaultInstance()) return this; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (other.hasFurnitureMakeSlot()) { mergeFurnitureMakeSlot(other.getFurnitureMakeSlot()); } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -513,49 +511,18 @@ public Builder mergeFrom( return this; } - private int retcode_ ; - /** - * int32 retcode = 1; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 1; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 1; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot furnitureMakeSlot_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder> furnitureMakeSlotBuilder_; /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; * @return Whether the furnitureMakeSlot field is set. */ public boolean hasFurnitureMakeSlot() { return furnitureMakeSlotBuilder_ != null || furnitureMakeSlot_ != null; } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; * @return The furnitureMakeSlot. */ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot getFurnitureMakeSlot() { @@ -566,7 +533,7 @@ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot g } } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ public Builder setFurnitureMakeSlot(emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot value) { if (furnitureMakeSlotBuilder_ == null) { @@ -582,7 +549,7 @@ public Builder setFurnitureMakeSlot(emu.grasscutter.net.proto.FurnitureMakeSlotO return this; } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ public Builder setFurnitureMakeSlot( emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder builderForValue) { @@ -596,7 +563,7 @@ public Builder setFurnitureMakeSlot( return this; } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ public Builder mergeFurnitureMakeSlot(emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot value) { if (furnitureMakeSlotBuilder_ == null) { @@ -614,7 +581,7 @@ public Builder mergeFurnitureMakeSlot(emu.grasscutter.net.proto.FurnitureMakeSlo return this; } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ public Builder clearFurnitureMakeSlot() { if (furnitureMakeSlotBuilder_ == null) { @@ -628,7 +595,7 @@ public Builder clearFurnitureMakeSlot() { return this; } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder getFurnitureMakeSlotBuilder() { @@ -636,7 +603,7 @@ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.B return getFurnitureMakeSlotFieldBuilder().getBuilder(); } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder() { if (furnitureMakeSlotBuilder_ != null) { @@ -647,7 +614,7 @@ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOr } } /** - * .FurnitureMakeSlot furniture_make_slot = 6; + * .FurnitureMakeSlot furniture_make_slot = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder> @@ -662,6 +629,37 @@ public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOr } return furnitureMakeSlotBuilder_; } + + private int retcode_ ; + /** + * int32 retcode = 8; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 8; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 8; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -731,8 +729,8 @@ public emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeSt java.lang.String[] descriptorData = { "\n\033FurnitureMakeStartRsp.proto\032\027Furniture" + "MakeSlot.proto\"Y\n\025FurnitureMakeStartRsp\022" + - "\017\n\007retcode\030\001 \001(\005\022/\n\023furniture_make_slot\030" + - "\006 \001(\0132\022.FurnitureMakeSlotB\033\n\031emu.grasscu" + + "/\n\023furniture_make_slot\030\005 \001(\0132\022.Furniture" + + "MakeSlot\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.grasscu" + "tter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -745,7 +743,7 @@ public emu.grasscutter.net.proto.FurnitureMakeStartRspOuterClass.FurnitureMakeSt internal_static_FurnitureMakeStartRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_FurnitureMakeStartRsp_descriptor, - new java.lang.String[] { "Retcode", "FurnitureMakeSlot", }); + new java.lang.String[] { "FurnitureMakeSlot", "Retcode", }); emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java index c6772e0787d..4a8d3a92b2d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java @@ -55,16 +55,16 @@ public interface GachaInfoOrBuilder extends int getBeginTime(); /** - * string gacha_record_url = 6; - * @return The gachaRecordUrl. + * string gacha_prob_url = 6; + * @return The gachaProbUrl. */ - java.lang.String getGachaRecordUrl(); + java.lang.String getGachaProbUrl(); /** - * string gacha_record_url = 6; - * @return The bytes for gachaRecordUrl. + * string gacha_prob_url = 6; + * @return The bytes for gachaProbUrl. */ com.google.protobuf.ByteString - getGachaRecordUrlBytes(); + getGachaProbUrlBytes(); /** * uint32 cost_item_num = 7; @@ -79,16 +79,16 @@ public interface GachaInfoOrBuilder extends int getScheduleId(); /** - * string gacha_prob_url = 9; - * @return The gachaProbUrl. + * string gacha_record_url = 9; + * @return The gachaRecordUrl. */ - java.lang.String getGachaProbUrl(); + java.lang.String getGachaRecordUrl(); /** - * string gacha_prob_url = 9; - * @return The bytes for gachaProbUrl. + * string gacha_record_url = 9; + * @return The bytes for gachaRecordUrl. */ com.google.protobuf.ByteString - getGachaProbUrlBytes(); + getGachaRecordUrlBytes(); /** * uint32 gacha_type = 10; @@ -180,16 +180,16 @@ public interface GachaInfoOrBuilder extends getTitleTextmapBytes(); /** - * string gacha_prob_url_oversea = 798; - * @return The gachaProbUrlOversea. + * string gacha_record_url_oversea = 798; + * @return The gachaRecordUrlOversea. */ - java.lang.String getGachaProbUrlOversea(); + java.lang.String getGachaRecordUrlOversea(); /** - * string gacha_prob_url_oversea = 798; - * @return The bytes for gachaProbUrlOversea. + * string gacha_record_url_oversea = 798; + * @return The bytes for gachaRecordUrlOversea. */ com.google.protobuf.ByteString - getGachaProbUrlOverseaBytes(); + getGachaRecordUrlOverseaBytes(); /** * uint32 cur_schedule_daily_gacha_times = 1087; @@ -198,17 +198,17 @@ public interface GachaInfoOrBuilder extends int getCurScheduleDailyGachaTimes(); /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @return A list containing the displayChronicle5ItemList. */ java.util.List getDisplayChronicle5ItemListList(); /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @return The count of displayChronicle5ItemList. */ int getDisplayChronicle5ItemListCount(); /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @param index The index of the element to return. * @return The displayChronicle5ItemList at the given index. */ @@ -268,16 +268,16 @@ emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder getGachaUpI int getGachaSortId(); /** - * string gacha_record_url_oversea = 1984; - * @return The gachaRecordUrlOversea. + * string gacha_prob_url_oversea = 1984; + * @return The gachaProbUrlOversea. */ - java.lang.String getGachaRecordUrlOversea(); + java.lang.String getGachaProbUrlOversea(); /** - * string gacha_record_url_oversea = 1984; - * @return The bytes for gachaRecordUrlOversea. + * string gacha_prob_url_oversea = 1984; + * @return The bytes for gachaProbUrlOversea. */ com.google.protobuf.ByteString - getGachaRecordUrlOverseaBytes(); + getGachaProbUrlOverseaBytes(); } /** * Protobuf type {@code GachaInfo} @@ -293,16 +293,16 @@ private GachaInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private GachaInfo() { gachaPreviewPrefabPath_ = ""; - gachaRecordUrl_ = ""; gachaProbUrl_ = ""; + gachaRecordUrl_ = ""; gachaPrefabPath_ = ""; displayUp5ItemList_ = emptyIntList(); titleTextmap_ = ""; - gachaProbUrlOversea_ = ""; + gachaRecordUrlOversea_ = ""; displayChronicle5ItemList_ = emptyIntList(); gachaUpInfoList_ = java.util.Collections.emptyList(); displayUp4ItemList_ = emptyIntList(); - gachaRecordUrlOversea_ = ""; + gachaProbUrlOversea_ = ""; } @java.lang.Override @@ -365,7 +365,7 @@ private GachaInfo( case 50: { java.lang.String s = input.readStringRequireUtf8(); - gachaRecordUrl_ = s; + gachaProbUrl_ = s; break; } case 56: { @@ -381,7 +381,7 @@ private GachaInfo( case 74: { java.lang.String s = input.readStringRequireUtf8(); - gachaProbUrl_ = s; + gachaRecordUrl_ = s; break; } case 80: { @@ -460,7 +460,7 @@ private GachaInfo( case 6386: { java.lang.String s = input.readStringRequireUtf8(); - gachaProbUrlOversea_ = s; + gachaRecordUrlOversea_ = s; break; } case 8696: { @@ -532,7 +532,7 @@ private GachaInfo( case 15874: { java.lang.String s = input.readStringRequireUtf8(); - gachaRecordUrlOversea_ = s; + gachaProbUrlOversea_ = s; break; } default: { @@ -661,38 +661,38 @@ public int getBeginTime() { return beginTime_; } - public static final int GACHA_RECORD_URL_FIELD_NUMBER = 6; - private volatile java.lang.Object gachaRecordUrl_; + public static final int GACHA_PROB_URL_FIELD_NUMBER = 6; + private volatile java.lang.Object gachaProbUrl_; /** - * string gacha_record_url = 6; - * @return The gachaRecordUrl. + * string gacha_prob_url = 6; + * @return The gachaProbUrl. */ @java.lang.Override - public java.lang.String getGachaRecordUrl() { - java.lang.Object ref = gachaRecordUrl_; + public java.lang.String getGachaProbUrl() { + java.lang.Object ref = gachaProbUrl_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gachaRecordUrl_ = s; + gachaProbUrl_ = s; return s; } } /** - * string gacha_record_url = 6; - * @return The bytes for gachaRecordUrl. + * string gacha_prob_url = 6; + * @return The bytes for gachaProbUrl. */ @java.lang.Override public com.google.protobuf.ByteString - getGachaRecordUrlBytes() { - java.lang.Object ref = gachaRecordUrl_; + getGachaProbUrlBytes() { + java.lang.Object ref = gachaProbUrl_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gachaRecordUrl_ = b; + gachaProbUrl_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -721,38 +721,38 @@ public int getScheduleId() { return scheduleId_; } - public static final int GACHA_PROB_URL_FIELD_NUMBER = 9; - private volatile java.lang.Object gachaProbUrl_; + public static final int GACHA_RECORD_URL_FIELD_NUMBER = 9; + private volatile java.lang.Object gachaRecordUrl_; /** - * string gacha_prob_url = 9; - * @return The gachaProbUrl. + * string gacha_record_url = 9; + * @return The gachaRecordUrl. */ @java.lang.Override - public java.lang.String getGachaProbUrl() { - java.lang.Object ref = gachaProbUrl_; + public java.lang.String getGachaRecordUrl() { + java.lang.Object ref = gachaRecordUrl_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gachaProbUrl_ = s; + gachaRecordUrl_ = s; return s; } } /** - * string gacha_prob_url = 9; - * @return The bytes for gachaProbUrl. + * string gacha_record_url = 9; + * @return The bytes for gachaRecordUrl. */ @java.lang.Override public com.google.protobuf.ByteString - getGachaProbUrlBytes() { - java.lang.Object ref = gachaProbUrl_; + getGachaRecordUrlBytes() { + java.lang.Object ref = gachaRecordUrl_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gachaProbUrl_ = b; + gachaRecordUrl_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -951,38 +951,38 @@ public java.lang.String getTitleTextmap() { } } - public static final int GACHA_PROB_URL_OVERSEA_FIELD_NUMBER = 798; - private volatile java.lang.Object gachaProbUrlOversea_; + public static final int GACHA_RECORD_URL_OVERSEA_FIELD_NUMBER = 798; + private volatile java.lang.Object gachaRecordUrlOversea_; /** - * string gacha_prob_url_oversea = 798; - * @return The gachaProbUrlOversea. + * string gacha_record_url_oversea = 798; + * @return The gachaRecordUrlOversea. */ @java.lang.Override - public java.lang.String getGachaProbUrlOversea() { - java.lang.Object ref = gachaProbUrlOversea_; + public java.lang.String getGachaRecordUrlOversea() { + java.lang.Object ref = gachaRecordUrlOversea_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gachaProbUrlOversea_ = s; + gachaRecordUrlOversea_ = s; return s; } } /** - * string gacha_prob_url_oversea = 798; - * @return The bytes for gachaProbUrlOversea. + * string gacha_record_url_oversea = 798; + * @return The bytes for gachaRecordUrlOversea. */ @java.lang.Override public com.google.protobuf.ByteString - getGachaProbUrlOverseaBytes() { - java.lang.Object ref = gachaProbUrlOversea_; + getGachaRecordUrlOverseaBytes() { + java.lang.Object ref = gachaRecordUrlOversea_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gachaProbUrlOversea_ = b; + gachaRecordUrlOversea_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -1000,10 +1000,10 @@ public int getCurScheduleDailyGachaTimes() { return curScheduleDailyGachaTimes_; } - public static final int DISPLAY_CHRONICLE5_ITEM_LIST_FIELD_NUMBER = 1448; + public static final int DISPLAYCHRONICLE5ITEMLIST_FIELD_NUMBER = 1448; private com.google.protobuf.Internal.IntList displayChronicle5ItemList_; /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @return A list containing the displayChronicle5ItemList. */ @java.lang.Override @@ -1012,14 +1012,14 @@ public int getCurScheduleDailyGachaTimes() { return displayChronicle5ItemList_; } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @return The count of displayChronicle5ItemList. */ public int getDisplayChronicle5ItemListCount() { return displayChronicle5ItemList_.size(); } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @param index The index of the element to return. * @return The displayChronicle5ItemList at the given index. */ @@ -1118,38 +1118,38 @@ public int getGachaSortId() { return gachaSortId_; } - public static final int GACHA_RECORD_URL_OVERSEA_FIELD_NUMBER = 1984; - private volatile java.lang.Object gachaRecordUrlOversea_; + public static final int GACHA_PROB_URL_OVERSEA_FIELD_NUMBER = 1984; + private volatile java.lang.Object gachaProbUrlOversea_; /** - * string gacha_record_url_oversea = 1984; - * @return The gachaRecordUrlOversea. + * string gacha_prob_url_oversea = 1984; + * @return The gachaProbUrlOversea. */ @java.lang.Override - public java.lang.String getGachaRecordUrlOversea() { - java.lang.Object ref = gachaRecordUrlOversea_; + public java.lang.String getGachaProbUrlOversea() { + java.lang.Object ref = gachaProbUrlOversea_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gachaRecordUrlOversea_ = s; + gachaProbUrlOversea_ = s; return s; } } /** - * string gacha_record_url_oversea = 1984; - * @return The bytes for gachaRecordUrlOversea. + * string gacha_prob_url_oversea = 1984; + * @return The bytes for gachaProbUrlOversea. */ @java.lang.Override public com.google.protobuf.ByteString - getGachaRecordUrlOverseaBytes() { - java.lang.Object ref = gachaRecordUrlOversea_; + getGachaProbUrlOverseaBytes() { + java.lang.Object ref = gachaProbUrlOversea_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gachaRecordUrlOversea_ = b; + gachaProbUrlOversea_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -1186,8 +1186,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (beginTime_ != 0) { output.writeUInt32(5, beginTime_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrl_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 6, gachaRecordUrl_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrl_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, gachaProbUrl_); } if (costItemNum_ != 0) { output.writeUInt32(7, costItemNum_); @@ -1195,8 +1195,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (scheduleId_ != 0) { output.writeUInt32(8, scheduleId_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrl_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 9, gachaProbUrl_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrl_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 9, gachaRecordUrl_); } if (gachaType_ != 0) { output.writeUInt32(10, gachaType_); @@ -1235,8 +1235,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(titleTextmap_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 782, titleTextmap_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrlOversea_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 798, gachaProbUrlOversea_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrlOversea_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 798, gachaRecordUrlOversea_); } if (curScheduleDailyGachaTimes_ != 0) { output.writeUInt32(1087, curScheduleDailyGachaTimes_); @@ -1264,8 +1264,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (gachaSortId_ != 0) { output.writeUInt32(1938, gachaSortId_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrlOversea_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1984, gachaRecordUrlOversea_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrlOversea_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1984, gachaProbUrlOversea_); } unknownFields.writeTo(output); } @@ -1295,8 +1295,8 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(5, beginTime_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrl_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, gachaRecordUrl_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrl_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, gachaProbUrl_); } if (costItemNum_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -1306,8 +1306,8 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(8, scheduleId_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrl_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, gachaProbUrl_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrl_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, gachaRecordUrl_); } if (gachaType_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -1361,8 +1361,8 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(titleTextmap_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(782, titleTextmap_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrlOversea_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(798, gachaProbUrlOversea_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrlOversea_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(798, gachaRecordUrlOversea_); } if (curScheduleDailyGachaTimes_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -1408,8 +1408,8 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(1938, gachaSortId_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrlOversea_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1984, gachaRecordUrlOversea_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrlOversea_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1984, gachaProbUrlOversea_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -1436,14 +1436,14 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getGachaPreviewPrefabPath())) return false; if (getBeginTime() != other.getBeginTime()) return false; - if (!getGachaRecordUrl() - .equals(other.getGachaRecordUrl())) return false; + if (!getGachaProbUrl() + .equals(other.getGachaProbUrl())) return false; if (getCostItemNum() != other.getCostItemNum()) return false; if (getScheduleId() != other.getScheduleId()) return false; - if (!getGachaProbUrl() - .equals(other.getGachaProbUrl())) return false; + if (!getGachaRecordUrl() + .equals(other.getGachaRecordUrl())) return false; if (getGachaType() != other.getGachaType()) return false; if (!getGachaPrefabPath() @@ -1466,8 +1466,8 @@ public boolean equals(final java.lang.Object obj) { != other.getWishItemId()) return false; if (!getTitleTextmap() .equals(other.getTitleTextmap())) return false; - if (!getGachaProbUrlOversea() - .equals(other.getGachaProbUrlOversea())) return false; + if (!getGachaRecordUrlOversea() + .equals(other.getGachaRecordUrlOversea())) return false; if (getCurScheduleDailyGachaTimes() != other.getCurScheduleDailyGachaTimes()) return false; if (!getDisplayChronicle5ItemListList() @@ -1480,8 +1480,8 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getDisplayUp4ItemListList())) return false; if (getGachaSortId() != other.getGachaSortId()) return false; - if (!getGachaRecordUrlOversea() - .equals(other.getGachaRecordUrlOversea())) return false; + if (!getGachaProbUrlOversea() + .equals(other.getGachaProbUrlOversea())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -1503,14 +1503,14 @@ public int hashCode() { hash = (53 * hash) + getGachaPreviewPrefabPath().hashCode(); hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER; hash = (53 * hash) + getBeginTime(); - hash = (37 * hash) + GACHA_RECORD_URL_FIELD_NUMBER; - hash = (53 * hash) + getGachaRecordUrl().hashCode(); + hash = (37 * hash) + GACHA_PROB_URL_FIELD_NUMBER; + hash = (53 * hash) + getGachaProbUrl().hashCode(); hash = (37 * hash) + COST_ITEM_NUM_FIELD_NUMBER; hash = (53 * hash) + getCostItemNum(); hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER; hash = (53 * hash) + getScheduleId(); - hash = (37 * hash) + GACHA_PROB_URL_FIELD_NUMBER; - hash = (53 * hash) + getGachaProbUrl().hashCode(); + hash = (37 * hash) + GACHA_RECORD_URL_FIELD_NUMBER; + hash = (53 * hash) + getGachaRecordUrl().hashCode(); hash = (37 * hash) + GACHA_TYPE_FIELD_NUMBER; hash = (53 * hash) + getGachaType(); hash = (37 * hash) + GACHA_PREFAB_PATH_FIELD_NUMBER; @@ -1536,12 +1536,12 @@ public int hashCode() { hash = (53 * hash) + getWishItemId(); hash = (37 * hash) + TITLE_TEXTMAP_FIELD_NUMBER; hash = (53 * hash) + getTitleTextmap().hashCode(); - hash = (37 * hash) + GACHA_PROB_URL_OVERSEA_FIELD_NUMBER; - hash = (53 * hash) + getGachaProbUrlOversea().hashCode(); + hash = (37 * hash) + GACHA_RECORD_URL_OVERSEA_FIELD_NUMBER; + hash = (53 * hash) + getGachaRecordUrlOversea().hashCode(); hash = (37 * hash) + CUR_SCHEDULE_DAILY_GACHA_TIMES_FIELD_NUMBER; hash = (53 * hash) + getCurScheduleDailyGachaTimes(); if (getDisplayChronicle5ItemListCount() > 0) { - hash = (37 * hash) + DISPLAY_CHRONICLE5_ITEM_LIST_FIELD_NUMBER; + hash = (37 * hash) + DISPLAYCHRONICLE5ITEMLIST_FIELD_NUMBER; hash = (53 * hash) + getDisplayChronicle5ItemListList().hashCode(); } hash = (37 * hash) + LAGAHPEKLHM_FIELD_NUMBER; @@ -1557,8 +1557,8 @@ public int hashCode() { } hash = (37 * hash) + GACHA_SORT_ID_FIELD_NUMBER; hash = (53 * hash) + getGachaSortId(); - hash = (37 * hash) + GACHA_RECORD_URL_OVERSEA_FIELD_NUMBER; - hash = (53 * hash) + getGachaRecordUrlOversea().hashCode(); + hash = (37 * hash) + GACHA_PROB_URL_OVERSEA_FIELD_NUMBER; + hash = (53 * hash) + getGachaProbUrlOversea().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1703,13 +1703,13 @@ public Builder clear() { beginTime_ = 0; - gachaRecordUrl_ = ""; + gachaProbUrl_ = ""; costItemNum_ = 0; scheduleId_ = 0; - gachaProbUrl_ = ""; + gachaRecordUrl_ = ""; gachaType_ = 0; @@ -1733,7 +1733,7 @@ public Builder clear() { titleTextmap_ = ""; - gachaProbUrlOversea_ = ""; + gachaRecordUrlOversea_ = ""; curScheduleDailyGachaTimes_ = 0; @@ -1751,7 +1751,7 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000008); gachaSortId_ = 0; - gachaRecordUrlOversea_ = ""; + gachaProbUrlOversea_ = ""; return this; } @@ -1785,10 +1785,10 @@ public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo buildPartial() { result.tenCostItemNum_ = tenCostItemNum_; result.gachaPreviewPrefabPath_ = gachaPreviewPrefabPath_; result.beginTime_ = beginTime_; - result.gachaRecordUrl_ = gachaRecordUrl_; + result.gachaProbUrl_ = gachaProbUrl_; result.costItemNum_ = costItemNum_; result.scheduleId_ = scheduleId_; - result.gachaProbUrl_ = gachaProbUrl_; + result.gachaRecordUrl_ = gachaRecordUrl_; result.gachaType_ = gachaType_; result.gachaPrefabPath_ = gachaPrefabPath_; result.costItemId_ = costItemId_; @@ -1804,7 +1804,7 @@ public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo buildPartial() { result.isNewWish_ = isNewWish_; result.wishItemId_ = wishItemId_; result.titleTextmap_ = titleTextmap_; - result.gachaProbUrlOversea_ = gachaProbUrlOversea_; + result.gachaRecordUrlOversea_ = gachaRecordUrlOversea_; result.curScheduleDailyGachaTimes_ = curScheduleDailyGachaTimes_; if (((bitField0_ & 0x00000002) != 0)) { displayChronicle5ItemList_.makeImmutable(); @@ -1827,7 +1827,7 @@ public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo buildPartial() { } result.displayUp4ItemList_ = displayUp4ItemList_; result.gachaSortId_ = gachaSortId_; - result.gachaRecordUrlOversea_ = gachaRecordUrlOversea_; + result.gachaProbUrlOversea_ = gachaProbUrlOversea_; onBuilt(); return result; } @@ -1892,8 +1892,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo if (other.getBeginTime() != 0) { setBeginTime(other.getBeginTime()); } - if (!other.getGachaRecordUrl().isEmpty()) { - gachaRecordUrl_ = other.gachaRecordUrl_; + if (!other.getGachaProbUrl().isEmpty()) { + gachaProbUrl_ = other.gachaProbUrl_; onChanged(); } if (other.getCostItemNum() != 0) { @@ -1902,8 +1902,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo if (other.getScheduleId() != 0) { setScheduleId(other.getScheduleId()); } - if (!other.getGachaProbUrl().isEmpty()) { - gachaProbUrl_ = other.gachaProbUrl_; + if (!other.getGachaRecordUrl().isEmpty()) { + gachaRecordUrl_ = other.gachaRecordUrl_; onChanged(); } if (other.getGachaType() != 0) { @@ -1948,8 +1948,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo titleTextmap_ = other.titleTextmap_; onChanged(); } - if (!other.getGachaProbUrlOversea().isEmpty()) { - gachaProbUrlOversea_ = other.gachaProbUrlOversea_; + if (!other.getGachaRecordUrlOversea().isEmpty()) { + gachaRecordUrlOversea_ = other.gachaRecordUrlOversea_; onChanged(); } if (other.getCurScheduleDailyGachaTimes() != 0) { @@ -2007,8 +2007,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo if (other.getGachaSortId() != 0) { setGachaSortId(other.getGachaSortId()); } - if (!other.getGachaRecordUrlOversea().isEmpty()) { - gachaRecordUrlOversea_ = other.gachaRecordUrlOversea_; + if (!other.getGachaProbUrlOversea().isEmpty()) { + gachaProbUrlOversea_ = other.gachaProbUrlOversea_; onChanged(); } this.mergeUnknownFields(other.unknownFields); @@ -2241,78 +2241,78 @@ public Builder clearBeginTime() { return this; } - private java.lang.Object gachaRecordUrl_ = ""; + private java.lang.Object gachaProbUrl_ = ""; /** - * string gacha_record_url = 6; - * @return The gachaRecordUrl. + * string gacha_prob_url = 6; + * @return The gachaProbUrl. */ - public java.lang.String getGachaRecordUrl() { - java.lang.Object ref = gachaRecordUrl_; + public java.lang.String getGachaProbUrl() { + java.lang.Object ref = gachaProbUrl_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gachaRecordUrl_ = s; + gachaProbUrl_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string gacha_record_url = 6; - * @return The bytes for gachaRecordUrl. + * string gacha_prob_url = 6; + * @return The bytes for gachaProbUrl. */ public com.google.protobuf.ByteString - getGachaRecordUrlBytes() { - java.lang.Object ref = gachaRecordUrl_; + getGachaProbUrlBytes() { + java.lang.Object ref = gachaProbUrl_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gachaRecordUrl_ = b; + gachaProbUrl_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string gacha_record_url = 6; - * @param value The gachaRecordUrl to set. + * string gacha_prob_url = 6; + * @param value The gachaProbUrl to set. * @return This builder for chaining. */ - public Builder setGachaRecordUrl( + public Builder setGachaProbUrl( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gachaRecordUrl_ = value; + gachaProbUrl_ = value; onChanged(); return this; } /** - * string gacha_record_url = 6; + * string gacha_prob_url = 6; * @return This builder for chaining. */ - public Builder clearGachaRecordUrl() { + public Builder clearGachaProbUrl() { - gachaRecordUrl_ = getDefaultInstance().getGachaRecordUrl(); + gachaProbUrl_ = getDefaultInstance().getGachaProbUrl(); onChanged(); return this; } /** - * string gacha_record_url = 6; - * @param value The bytes for gachaRecordUrl to set. + * string gacha_prob_url = 6; + * @param value The bytes for gachaProbUrl to set. * @return This builder for chaining. */ - public Builder setGachaRecordUrlBytes( + public Builder setGachaProbUrlBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gachaRecordUrl_ = value; + gachaProbUrl_ = value; onChanged(); return this; } @@ -2379,78 +2379,78 @@ public Builder clearScheduleId() { return this; } - private java.lang.Object gachaProbUrl_ = ""; + private java.lang.Object gachaRecordUrl_ = ""; /** - * string gacha_prob_url = 9; - * @return The gachaProbUrl. + * string gacha_record_url = 9; + * @return The gachaRecordUrl. */ - public java.lang.String getGachaProbUrl() { - java.lang.Object ref = gachaProbUrl_; + public java.lang.String getGachaRecordUrl() { + java.lang.Object ref = gachaRecordUrl_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gachaProbUrl_ = s; + gachaRecordUrl_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string gacha_prob_url = 9; - * @return The bytes for gachaProbUrl. + * string gacha_record_url = 9; + * @return The bytes for gachaRecordUrl. */ public com.google.protobuf.ByteString - getGachaProbUrlBytes() { - java.lang.Object ref = gachaProbUrl_; + getGachaRecordUrlBytes() { + java.lang.Object ref = gachaRecordUrl_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gachaProbUrl_ = b; + gachaRecordUrl_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string gacha_prob_url = 9; - * @param value The gachaProbUrl to set. + * string gacha_record_url = 9; + * @param value The gachaRecordUrl to set. * @return This builder for chaining. */ - public Builder setGachaProbUrl( + public Builder setGachaRecordUrl( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gachaProbUrl_ = value; + gachaRecordUrl_ = value; onChanged(); return this; } /** - * string gacha_prob_url = 9; + * string gacha_record_url = 9; * @return This builder for chaining. */ - public Builder clearGachaProbUrl() { + public Builder clearGachaRecordUrl() { - gachaProbUrl_ = getDefaultInstance().getGachaProbUrl(); + gachaRecordUrl_ = getDefaultInstance().getGachaRecordUrl(); onChanged(); return this; } /** - * string gacha_prob_url = 9; - * @param value The bytes for gachaProbUrl to set. + * string gacha_record_url = 9; + * @param value The bytes for gachaRecordUrl to set. * @return This builder for chaining. */ - public Builder setGachaProbUrlBytes( + public Builder setGachaRecordUrlBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gachaProbUrl_ = value; + gachaRecordUrl_ = value; onChanged(); return this; } @@ -2934,78 +2934,78 @@ public Builder setTitleTextmapBytes( return this; } - private java.lang.Object gachaProbUrlOversea_ = ""; + private java.lang.Object gachaRecordUrlOversea_ = ""; /** - * string gacha_prob_url_oversea = 798; - * @return The gachaProbUrlOversea. + * string gacha_record_url_oversea = 798; + * @return The gachaRecordUrlOversea. */ - public java.lang.String getGachaProbUrlOversea() { - java.lang.Object ref = gachaProbUrlOversea_; + public java.lang.String getGachaRecordUrlOversea() { + java.lang.Object ref = gachaRecordUrlOversea_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gachaProbUrlOversea_ = s; + gachaRecordUrlOversea_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string gacha_prob_url_oversea = 798; - * @return The bytes for gachaProbUrlOversea. + * string gacha_record_url_oversea = 798; + * @return The bytes for gachaRecordUrlOversea. */ public com.google.protobuf.ByteString - getGachaProbUrlOverseaBytes() { - java.lang.Object ref = gachaProbUrlOversea_; + getGachaRecordUrlOverseaBytes() { + java.lang.Object ref = gachaRecordUrlOversea_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gachaProbUrlOversea_ = b; + gachaRecordUrlOversea_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string gacha_prob_url_oversea = 798; - * @param value The gachaProbUrlOversea to set. + * string gacha_record_url_oversea = 798; + * @param value The gachaRecordUrlOversea to set. * @return This builder for chaining. */ - public Builder setGachaProbUrlOversea( + public Builder setGachaRecordUrlOversea( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gachaProbUrlOversea_ = value; + gachaRecordUrlOversea_ = value; onChanged(); return this; } /** - * string gacha_prob_url_oversea = 798; + * string gacha_record_url_oversea = 798; * @return This builder for chaining. */ - public Builder clearGachaProbUrlOversea() { + public Builder clearGachaRecordUrlOversea() { - gachaProbUrlOversea_ = getDefaultInstance().getGachaProbUrlOversea(); + gachaRecordUrlOversea_ = getDefaultInstance().getGachaRecordUrlOversea(); onChanged(); return this; } /** - * string gacha_prob_url_oversea = 798; - * @param value The bytes for gachaProbUrlOversea to set. + * string gacha_record_url_oversea = 798; + * @param value The bytes for gachaRecordUrlOversea to set. * @return This builder for chaining. */ - public Builder setGachaProbUrlOverseaBytes( + public Builder setGachaRecordUrlOverseaBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gachaProbUrlOversea_ = value; + gachaRecordUrlOversea_ = value; onChanged(); return this; } @@ -3049,7 +3049,7 @@ private void ensureDisplayChronicle5ItemListIsMutable() { } } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @return A list containing the displayChronicle5ItemList. */ public java.util.List @@ -3058,14 +3058,14 @@ private void ensureDisplayChronicle5ItemListIsMutable() { java.util.Collections.unmodifiableList(displayChronicle5ItemList_) : displayChronicle5ItemList_; } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @return The count of displayChronicle5ItemList. */ public int getDisplayChronicle5ItemListCount() { return displayChronicle5ItemList_.size(); } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @param index The index of the element to return. * @return The displayChronicle5ItemList at the given index. */ @@ -3073,7 +3073,7 @@ public int getDisplayChronicle5ItemList(int index) { return displayChronicle5ItemList_.getInt(index); } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @param index The index to set the value at. * @param value The displayChronicle5ItemList to set. * @return This builder for chaining. @@ -3086,7 +3086,7 @@ public Builder setDisplayChronicle5ItemList( return this; } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @param value The displayChronicle5ItemList to add. * @return This builder for chaining. */ @@ -3097,7 +3097,7 @@ public Builder addDisplayChronicle5ItemList(int value) { return this; } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @param values The displayChronicle5ItemList to add. * @return This builder for chaining. */ @@ -3110,7 +3110,7 @@ public Builder addAllDisplayChronicle5ItemList( return this; } /** - * repeated uint32 display_chronicle5_item_list = 1448; + * repeated uint32 DisplayChronicle5ItemList = 1448; * @return This builder for chaining. */ public Builder clearDisplayChronicle5ItemList() { @@ -3501,78 +3501,78 @@ public Builder clearGachaSortId() { return this; } - private java.lang.Object gachaRecordUrlOversea_ = ""; + private java.lang.Object gachaProbUrlOversea_ = ""; /** - * string gacha_record_url_oversea = 1984; - * @return The gachaRecordUrlOversea. + * string gacha_prob_url_oversea = 1984; + * @return The gachaProbUrlOversea. */ - public java.lang.String getGachaRecordUrlOversea() { - java.lang.Object ref = gachaRecordUrlOversea_; + public java.lang.String getGachaProbUrlOversea() { + java.lang.Object ref = gachaProbUrlOversea_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gachaRecordUrlOversea_ = s; + gachaProbUrlOversea_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string gacha_record_url_oversea = 1984; - * @return The bytes for gachaRecordUrlOversea. + * string gacha_prob_url_oversea = 1984; + * @return The bytes for gachaProbUrlOversea. */ public com.google.protobuf.ByteString - getGachaRecordUrlOverseaBytes() { - java.lang.Object ref = gachaRecordUrlOversea_; + getGachaProbUrlOverseaBytes() { + java.lang.Object ref = gachaProbUrlOversea_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gachaRecordUrlOversea_ = b; + gachaProbUrlOversea_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string gacha_record_url_oversea = 1984; - * @param value The gachaRecordUrlOversea to set. + * string gacha_prob_url_oversea = 1984; + * @param value The gachaProbUrlOversea to set. * @return This builder for chaining. */ - public Builder setGachaRecordUrlOversea( + public Builder setGachaProbUrlOversea( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gachaRecordUrlOversea_ = value; + gachaProbUrlOversea_ = value; onChanged(); return this; } /** - * string gacha_record_url_oversea = 1984; + * string gacha_prob_url_oversea = 1984; * @return This builder for chaining. */ - public Builder clearGachaRecordUrlOversea() { + public Builder clearGachaProbUrlOversea() { - gachaRecordUrlOversea_ = getDefaultInstance().getGachaRecordUrlOversea(); + gachaProbUrlOversea_ = getDefaultInstance().getGachaProbUrlOversea(); onChanged(); return this; } /** - * string gacha_record_url_oversea = 1984; - * @param value The bytes for gachaRecordUrlOversea to set. + * string gacha_prob_url_oversea = 1984; + * @param value The bytes for gachaProbUrlOversea to set. * @return This builder for chaining. */ - public Builder setGachaRecordUrlOverseaBytes( + public Builder setGachaProbUrlOverseaBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gachaRecordUrlOversea_ = value; + gachaProbUrlOversea_ = value; onChanged(); return this; } @@ -3643,28 +3643,28 @@ public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo getDefaultInstanc descriptor; static { java.lang.String[] descriptorData = { - "\n\017GachaInfo.proto\032\021GachaUpInfo.proto\"\205\006\n" + + "\n\017GachaInfo.proto\032\021GachaUpInfo.proto\"\202\006\n" + "\tGachaInfo\022\020\n\010end_time\030\001 \001(\r\022\025\n\rwish_pro" + "gress\030\002 \001(\r\022\031\n\021ten_cost_item_num\030\003 \001(\r\022!" + "\n\031gacha_preview_prefab_path\030\004 \001(\t\022\022\n\nbeg" + - "in_time\030\005 \001(\r\022\030\n\020gacha_record_url\030\006 \001(\t\022" + - "\025\n\rcost_item_num\030\007 \001(\r\022\023\n\013schedule_id\030\010 " + - "\001(\r\022\026\n\016gacha_prob_url\030\t \001(\t\022\022\n\ngacha_typ" + + "in_time\030\005 \001(\r\022\026\n\016gacha_prob_url\030\006 \001(\t\022\025\n" + + "\rcost_item_num\030\007 \001(\r\022\023\n\013schedule_id\030\010 \001(" + + "\r\022\030\n\020gacha_record_url\030\t \001(\t\022\022\n\ngacha_typ" + "e\030\n \001(\r\022\031\n\021gacha_prefab_path\030\013 \001(\t\022\024\n\014co" + "st_item_id\030\014 \001(\r\022\031\n\021wish_max_progress\030\r " + "\001(\r\022\030\n\020left_gacha_times\030\016 \001(\r\022\031\n\021gacha_t" + "imes_limit\030\017 \001(\r\022\035\n\025display_up5_item_lis" + "t\030c \003(\r\022\031\n\020ten_cost_item_id\030\363\001 \001(\r\022\024\n\013is" + "_new_wish\030\373\001 \001(\010\022\025\n\014wish_item_id\030\327\004 \001(\r\022" + - "\026\n\rtitle_textmap\030\216\006 \001(\t\022\037\n\026gacha_prob_ur" + - "l_oversea\030\236\006 \001(\t\022\'\n\036cur_schedule_daily_g" + - "acha_times\030\277\010 \001(\r\022%\n\034display_chronicle5_" + - "item_list\030\250\013 \003(\r\022\024\n\013LAGAHPEKLHM\030\345\013 \001(\010\022)" + - "\n\022gacha_up_info_list\030\257\r \003(\0132\014.GachaUpInf" + - "o\022\036\n\025display_up4_item_list\030\332\016 \003(\r\022\026\n\rgac" + - "ha_sort_id\030\222\017 \001(\r\022!\n\030gacha_record_url_ov" + - "ersea\030\300\017 \001(\tB\033\n\031emu.grasscutter.net.prot" + - "ob\006proto3" + "\026\n\rtitle_textmap\030\216\006 \001(\t\022!\n\030gacha_record_" + + "url_oversea\030\236\006 \001(\t\022\'\n\036cur_schedule_daily" + + "_gacha_times\030\277\010 \001(\r\022\"\n\031DisplayChronicle5" + + "ItemList\030\250\013 \003(\r\022\024\n\013LAGAHPEKLHM\030\345\013 \001(\010\022)\n" + + "\022gacha_up_info_list\030\257\r \003(\0132\014.GachaUpInfo" + + "\022\036\n\025display_up4_item_list\030\332\016 \003(\r\022\026\n\rgach" + + "a_sort_id\030\222\017 \001(\r\022\037\n\026gacha_prob_url_overs" + + "ea\030\300\017 \001(\tB\033\n\031emu.grasscutter.net.protob\006" + + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -3676,7 +3676,7 @@ public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo getDefaultInstanc internal_static_GachaInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GachaInfo_descriptor, - new java.lang.String[] { "EndTime", "WishProgress", "TenCostItemNum", "GachaPreviewPrefabPath", "BeginTime", "GachaRecordUrl", "CostItemNum", "ScheduleId", "GachaProbUrl", "GachaType", "GachaPrefabPath", "CostItemId", "WishMaxProgress", "LeftGachaTimes", "GachaTimesLimit", "DisplayUp5ItemList", "TenCostItemId", "IsNewWish", "WishItemId", "TitleTextmap", "GachaProbUrlOversea", "CurScheduleDailyGachaTimes", "DisplayChronicle5ItemList", "LAGAHPEKLHM", "GachaUpInfoList", "DisplayUp4ItemList", "GachaSortId", "GachaRecordUrlOversea", }); + new java.lang.String[] { "EndTime", "WishProgress", "TenCostItemNum", "GachaPreviewPrefabPath", "BeginTime", "GachaProbUrl", "CostItemNum", "ScheduleId", "GachaRecordUrl", "GachaType", "GachaPrefabPath", "CostItemId", "WishMaxProgress", "LeftGachaTimes", "GachaTimesLimit", "DisplayUp5ItemList", "TenCostItemId", "IsNewWish", "WishItemId", "TitleTextmap", "GachaRecordUrlOversea", "CurScheduleDailyGachaTimes", "DisplayChronicle5ItemList", "LAGAHPEKLHM", "GachaUpInfoList", "DisplayUp4ItemList", "GachaSortId", "GachaProbUrlOversea", }); emu.grasscutter.net.proto.GachaUpInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GachaWishReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaWishReqOuterClass.java index 61c26d9760d..7dd208fae3f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GachaWishReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaWishReqOuterClass.java @@ -39,6 +39,7 @@ public interface GachaWishReqOrBuilder extends /** * 
    * CmdId: 25407
+   * obf: IKOMCHMHPCK
    *
* * Protobuf type {@code GachaWishReq} @@ -345,6 +346,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 25407
+     * obf: IKOMCHMHPCK
      *
* * Protobuf type {@code GachaWishReq} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GachaWishRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaWishRspOuterClass.java index 17652863006..db779762d69 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GachaWishRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaWishRspOuterClass.java @@ -19,45 +19,65 @@ public interface GachaWishRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 wishItemId = 11; - * @return The wishItemId. + * 
+     * wishMaxProgress
+     *
+ * + * uint32 gacha_sort_id = 2; + * @return The gachaSortId. */ - int getWishItemId(); + int getGachaSortId(); /** - * uint32 gachaScheduleId = 7; - * @return The gachaScheduleId. + * int32 retcode = 5; + * @return The retcode. */ - int getGachaScheduleId(); + int getRetcode(); /** - * uint32 gachaType = 1; + * 
+     * gachaType
+     *
+ * + * uint32 gacha_type = 6; * @return The gachaType. */ int getGachaType(); /** - * int32 retcode = 9; - * @return The retcode. + * 
+     * gachaScheduleId
+     *
+ * + * uint32 gacha_schedule_id = 7; + * @return The gachaScheduleId. */ - int getRetcode(); + int getGachaScheduleId(); /** - * uint32 wishMaxProgress = 5; - * @return The wishMaxProgress. + * 
+     * wishItemId
+     *
+ * + * uint32 wish_item_id = 12; + * @return The wishItemId. */ - int getWishMaxProgress(); + int getWishItemId(); /** - * uint32 wishProgress = 15; - * @return The wishProgress. + * 
+     * wishProgress
+     *
+ * + * uint32 ten_cost_item_id = 13; + * @return The tenCostItemId. */ - int getWishProgress(); + int getTenCostItemId(); } /** * 
-   * CmdId: 9333
-   * Obf: NLENODLFFAC
+   * CmdId: 23268
+   * obf: EIMIAJKOGFC
    *
* * Protobuf type {@code GachaWishRsp} @@ -104,34 +124,34 @@ private GachaWishRsp( case 0: done = true; break; - case 8: { + case 16: { - gachaType_ = input.readUInt32(); + gachaSortId_ = input.readUInt32(); break; } case 40: { - wishMaxProgress_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 56: { + case 48: { - gachaScheduleId_ = input.readUInt32(); + gachaType_ = input.readUInt32(); break; } - case 72: { + case 56: { - retcode_ = input.readInt32(); + gachaScheduleId_ = input.readUInt32(); break; } - case 88: { + case 96: { wishItemId_ = input.readUInt32(); break; } - case 120: { + case 104: { - wishProgress_ = input.readUInt32(); + tenCostItemId_ = input.readUInt32(); break; } default: { @@ -166,32 +186,40 @@ private GachaWishRsp( emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp.class, emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp.Builder.class); } - public static final int WISHITEMID_FIELD_NUMBER = 11; - private int wishItemId_; + public static final int GACHA_SORT_ID_FIELD_NUMBER = 2; + private int gachaSortId_; /** - * uint32 wishItemId = 11; - * @return The wishItemId. + * 
+     * wishMaxProgress
+     *
+ * + * uint32 gacha_sort_id = 2; + * @return The gachaSortId. */ @java.lang.Override - public int getWishItemId() { - return wishItemId_; + public int getGachaSortId() { + return gachaSortId_; } - public static final int GACHASCHEDULEID_FIELD_NUMBER = 7; - private int gachaScheduleId_; + public static final int RETCODE_FIELD_NUMBER = 5; + private int retcode_; /** - * uint32 gachaScheduleId = 7; - * @return The gachaScheduleId. + * int32 retcode = 5; + * @return The retcode. */ @java.lang.Override - public int getGachaScheduleId() { - return gachaScheduleId_; + public int getRetcode() { + return retcode_; } - public static final int GACHATYPE_FIELD_NUMBER = 1; + public static final int GACHA_TYPE_FIELD_NUMBER = 6; private int gachaType_; /** - * uint32 gachaType = 1; + * 
+     * gachaType
+     *
+ * + * uint32 gacha_type = 6; * @return The gachaType. */ @java.lang.Override @@ -199,37 +227,49 @@ public int getGachaType() { return gachaType_; } - public static final int RETCODE_FIELD_NUMBER = 9; - private int retcode_; + public static final int GACHA_SCHEDULE_ID_FIELD_NUMBER = 7; + private int gachaScheduleId_; /** - * int32 retcode = 9; - * @return The retcode. + * 
+     * gachaScheduleId
+     *
+ * + * uint32 gacha_schedule_id = 7; + * @return The gachaScheduleId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getGachaScheduleId() { + return gachaScheduleId_; } - public static final int WISHMAXPROGRESS_FIELD_NUMBER = 5; - private int wishMaxProgress_; + public static final int WISH_ITEM_ID_FIELD_NUMBER = 12; + private int wishItemId_; /** - * uint32 wishMaxProgress = 5; - * @return The wishMaxProgress. + * 
+     * wishItemId
+     *
+ * + * uint32 wish_item_id = 12; + * @return The wishItemId. */ @java.lang.Override - public int getWishMaxProgress() { - return wishMaxProgress_; + public int getWishItemId() { + return wishItemId_; } - public static final int WISHPROGRESS_FIELD_NUMBER = 15; - private int wishProgress_; + public static final int TEN_COST_ITEM_ID_FIELD_NUMBER = 13; + private int tenCostItemId_; /** - * uint32 wishProgress = 15; - * @return The wishProgress. + * 
+     * wishProgress
+     *
+ * + * uint32 ten_cost_item_id = 13; + * @return The tenCostItemId. */ @java.lang.Override - public int getWishProgress() { - return wishProgress_; + public int getTenCostItemId() { + return tenCostItemId_; } private byte memoizedIsInitialized = -1; @@ -246,23 +286,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (gachaType_ != 0) { - output.writeUInt32(1, gachaType_); + if (gachaSortId_ != 0) { + output.writeUInt32(2, gachaSortId_); } - if (wishMaxProgress_ != 0) { - output.writeUInt32(5, wishMaxProgress_); + if (retcode_ != 0) { + output.writeInt32(5, retcode_); + } + if (gachaType_ != 0) { + output.writeUInt32(6, gachaType_); } if (gachaScheduleId_ != 0) { output.writeUInt32(7, gachaScheduleId_); } - if (retcode_ != 0) { - output.writeInt32(9, retcode_); - } if (wishItemId_ != 0) { - output.writeUInt32(11, wishItemId_); + output.writeUInt32(12, wishItemId_); } - if (wishProgress_ != 0) { - output.writeUInt32(15, wishProgress_); + if (tenCostItemId_ != 0) { + output.writeUInt32(13, tenCostItemId_); } unknownFields.writeTo(output); } @@ -273,29 +313,29 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (gachaType_ != 0) { + if (gachaSortId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, gachaType_); + .computeUInt32Size(2, gachaSortId_); } - if (wishMaxProgress_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, wishMaxProgress_); + .computeInt32Size(5, retcode_); } - if (gachaScheduleId_ != 0) { + if (gachaType_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, gachaScheduleId_); + .computeUInt32Size(6, gachaType_); } - if (retcode_ != 0) { + if (gachaScheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, retcode_); + .computeUInt32Size(7, gachaScheduleId_); } if (wishItemId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, wishItemId_); + .computeUInt32Size(12, wishItemId_); } - if (wishProgress_ != 0) { + if (tenCostItemId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, wishProgress_); + .computeUInt32Size(13, tenCostItemId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -312,18 +352,18 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp other = (emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp) obj; - if (getWishItemId() - != other.getWishItemId()) return false; - if (getGachaScheduleId() - != other.getGachaScheduleId()) return false; - if (getGachaType() - != other.getGachaType()) return false; + if (getGachaSortId() + != other.getGachaSortId()) return false; if (getRetcode() != other.getRetcode()) return false; - if (getWishMaxProgress() - != other.getWishMaxProgress()) return false; - if (getWishProgress() - != other.getWishProgress()) return false; + if (getGachaType() + != other.getGachaType()) return false; + if (getGachaScheduleId() + != other.getGachaScheduleId()) return false; + if (getWishItemId() + != other.getWishItemId()) return false; + if (getTenCostItemId() + != other.getTenCostItemId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -335,18 +375,18 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + WISHITEMID_FIELD_NUMBER; - hash = (53 * hash) + getWishItemId(); - hash = (37 * hash) + GACHASCHEDULEID_FIELD_NUMBER; - hash = (53 * hash) + getGachaScheduleId(); - hash = (37 * hash) + GACHATYPE_FIELD_NUMBER; - hash = (53 * hash) + getGachaType(); + hash = (37 * hash) + GACHA_SORT_ID_FIELD_NUMBER; + hash = (53 * hash) + getGachaSortId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + WISHMAXPROGRESS_FIELD_NUMBER; - hash = (53 * hash) + getWishMaxProgress(); - hash = (37 * hash) + WISHPROGRESS_FIELD_NUMBER; - hash = (53 * hash) + getWishProgress(); + hash = (37 * hash) + GACHA_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getGachaType(); + hash = (37 * hash) + GACHA_SCHEDULE_ID_FIELD_NUMBER; + hash = (53 * hash) + getGachaScheduleId(); + hash = (37 * hash) + WISH_ITEM_ID_FIELD_NUMBER; + hash = (53 * hash) + getWishItemId(); + hash = (37 * hash) + TEN_COST_ITEM_ID_FIELD_NUMBER; + hash = (53 * hash) + getTenCostItemId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -444,8 +484,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 9333
-     * Obf: NLENODLFFAC
+     * CmdId: 23268
+     * obf: EIMIAJKOGFC
      *
* * Protobuf type {@code GachaWishRsp} @@ -485,17 +525,17 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - wishItemId_ = 0; + gachaSortId_ = 0; - gachaScheduleId_ = 0; + retcode_ = 0; gachaType_ = 0; - retcode_ = 0; + gachaScheduleId_ = 0; - wishMaxProgress_ = 0; + wishItemId_ = 0; - wishProgress_ = 0; + tenCostItemId_ = 0; return this; } @@ -523,12 +563,12 @@ public emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp build() { @java.lang.Override public emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp buildPartial() { emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp result = new emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp(this); - result.wishItemId_ = wishItemId_; - result.gachaScheduleId_ = gachaScheduleId_; - result.gachaType_ = gachaType_; + result.gachaSortId_ = gachaSortId_; result.retcode_ = retcode_; - result.wishMaxProgress_ = wishMaxProgress_; - result.wishProgress_ = wishProgress_; + result.gachaType_ = gachaType_; + result.gachaScheduleId_ = gachaScheduleId_; + result.wishItemId_ = wishItemId_; + result.tenCostItemId_ = tenCostItemId_; onBuilt(); return result; } @@ -577,23 +617,23 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp other) { if (other == emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp.getDefaultInstance()) return this; - if (other.getWishItemId() != 0) { - setWishItemId(other.getWishItemId()); + if (other.getGachaSortId() != 0) { + setGachaSortId(other.getGachaSortId()); } - if (other.getGachaScheduleId() != 0) { - setGachaScheduleId(other.getGachaScheduleId()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } if (other.getGachaType() != 0) { setGachaType(other.getGachaType()); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); + if (other.getGachaScheduleId() != 0) { + setGachaScheduleId(other.getGachaScheduleId()); } - if (other.getWishMaxProgress() != 0) { - setWishMaxProgress(other.getWishMaxProgress()); + if (other.getWishItemId() != 0) { + setWishItemId(other.getWishItemId()); } - if (other.getWishProgress() != 0) { - setWishProgress(other.getWishProgress()); + if (other.getTenCostItemId() != 0) { + setTenCostItemId(other.getTenCostItemId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -624,71 +664,87 @@ public Builder mergeFrom( return this; } - private int wishItemId_ ; + private int gachaSortId_ ; /** - * uint32 wishItemId = 11; - * @return The wishItemId. + * 
+       * wishMaxProgress
+       *
+ * + * uint32 gacha_sort_id = 2; + * @return The gachaSortId. */ @java.lang.Override - public int getWishItemId() { - return wishItemId_; + public int getGachaSortId() { + return gachaSortId_; } /** - * uint32 wishItemId = 11; - * @param value The wishItemId to set. + * 
+       * wishMaxProgress
+       *
+ * + * uint32 gacha_sort_id = 2; + * @param value The gachaSortId to set. * @return This builder for chaining. */ - public Builder setWishItemId(int value) { + public Builder setGachaSortId(int value) { - wishItemId_ = value; + gachaSortId_ = value; onChanged(); return this; } /** - * uint32 wishItemId = 11; + * 
+       * wishMaxProgress
+       *
+ * + * uint32 gacha_sort_id = 2; * @return This builder for chaining. */ - public Builder clearWishItemId() { + public Builder clearGachaSortId() { - wishItemId_ = 0; + gachaSortId_ = 0; onChanged(); return this; } - private int gachaScheduleId_ ; + private int retcode_ ; /** - * uint32 gachaScheduleId = 7; - * @return The gachaScheduleId. + * int32 retcode = 5; + * @return The retcode. */ @java.lang.Override - public int getGachaScheduleId() { - return gachaScheduleId_; + public int getRetcode() { + return retcode_; } /** - * uint32 gachaScheduleId = 7; - * @param value The gachaScheduleId to set. + * int32 retcode = 5; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setGachaScheduleId(int value) { + public Builder setRetcode(int value) { - gachaScheduleId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 gachaScheduleId = 7; + * int32 retcode = 5; * @return This builder for chaining. */ - public Builder clearGachaScheduleId() { + public Builder clearRetcode() { - gachaScheduleId_ = 0; + retcode_ = 0; onChanged(); return this; } private int gachaType_ ; /** - * uint32 gachaType = 1; + * 
+       * gachaType
+       *
+ * + * uint32 gacha_type = 6; * @return The gachaType. */ @java.lang.Override @@ -696,7 +752,11 @@ public int getGachaType() { return gachaType_; } /** - * uint32 gachaType = 1; + * 
+       * gachaType
+       *
+ * + * uint32 gacha_type = 6; * @param value The gachaType to set. * @return This builder for chaining. */ @@ -707,7 +767,11 @@ public Builder setGachaType(int value) { return this; } /** - * uint32 gachaType = 1; + * 
+       * gachaType
+       *
+ * + * uint32 gacha_type = 6; * @return This builder for chaining. */ public Builder clearGachaType() { @@ -717,95 +781,131 @@ public Builder clearGachaType() { return this; } - private int retcode_ ; + private int gachaScheduleId_ ; /** - * int32 retcode = 9; - * @return The retcode. + * 
+       * gachaScheduleId
+       *
+ * + * uint32 gacha_schedule_id = 7; + * @return The gachaScheduleId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getGachaScheduleId() { + return gachaScheduleId_; } /** - * int32 retcode = 9; - * @param value The retcode to set. + * 
+       * gachaScheduleId
+       *
+ * + * uint32 gacha_schedule_id = 7; + * @param value The gachaScheduleId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setGachaScheduleId(int value) { - retcode_ = value; + gachaScheduleId_ = value; onChanged(); return this; } /** - * int32 retcode = 9; + * 
+       * gachaScheduleId
+       *
+ * + * uint32 gacha_schedule_id = 7; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearGachaScheduleId() { - retcode_ = 0; + gachaScheduleId_ = 0; onChanged(); return this; } - private int wishMaxProgress_ ; + private int wishItemId_ ; /** - * uint32 wishMaxProgress = 5; - * @return The wishMaxProgress. + * 
+       * wishItemId
+       *
+ * + * uint32 wish_item_id = 12; + * @return The wishItemId. */ @java.lang.Override - public int getWishMaxProgress() { - return wishMaxProgress_; + public int getWishItemId() { + return wishItemId_; } /** - * uint32 wishMaxProgress = 5; - * @param value The wishMaxProgress to set. + * 
+       * wishItemId
+       *
+ * + * uint32 wish_item_id = 12; + * @param value The wishItemId to set. * @return This builder for chaining. */ - public Builder setWishMaxProgress(int value) { + public Builder setWishItemId(int value) { - wishMaxProgress_ = value; + wishItemId_ = value; onChanged(); return this; } /** - * uint32 wishMaxProgress = 5; + * 
+       * wishItemId
+       *
+ * + * uint32 wish_item_id = 12; * @return This builder for chaining. */ - public Builder clearWishMaxProgress() { + public Builder clearWishItemId() { - wishMaxProgress_ = 0; + wishItemId_ = 0; onChanged(); return this; } - private int wishProgress_ ; + private int tenCostItemId_ ; /** - * uint32 wishProgress = 15; - * @return The wishProgress. + * 
+       * wishProgress
+       *
+ * + * uint32 ten_cost_item_id = 13; + * @return The tenCostItemId. */ @java.lang.Override - public int getWishProgress() { - return wishProgress_; + public int getTenCostItemId() { + return tenCostItemId_; } /** - * uint32 wishProgress = 15; - * @param value The wishProgress to set. + * 
+       * wishProgress
+       *
+ * + * uint32 ten_cost_item_id = 13; + * @param value The tenCostItemId to set. * @return This builder for chaining. */ - public Builder setWishProgress(int value) { + public Builder setTenCostItemId(int value) { - wishProgress_ = value; + tenCostItemId_ = value; onChanged(); return this; } /** - * uint32 wishProgress = 15; + * 
+       * wishProgress
+       *
+ * + * uint32 ten_cost_item_id = 13; * @return This builder for chaining. */ - public Builder clearWishProgress() { + public Builder clearTenCostItemId() { - wishProgress_ = 0; + tenCostItemId_ = 0; onChanged(); return this; } @@ -876,12 +976,12 @@ public emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp getDefaultI descriptor; static { java.lang.String[] descriptorData = { - "\n\022GachaWishRsp.proto\"\216\001\n\014GachaWishRsp\022\022\n" + - "\nwishItemId\030\013 \001(\r\022\027\n\017gachaScheduleId\030\007 \001" + - "(\r\022\021\n\tgachaType\030\001 \001(\r\022\017\n\007retcode\030\t \001(\005\022\027" + - "\n\017wishMaxProgress\030\005 \001(\r\022\024\n\014wishProgress\030" + - "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + - "o3" + "\n\022GachaWishRsp.proto\"\225\001\n\014GachaWishRsp\022\025\n" + + "\rgacha_sort_id\030\002 \001(\r\022\017\n\007retcode\030\005 \001(\005\022\022\n" + + "\ngacha_type\030\006 \001(\r\022\031\n\021gacha_schedule_id\030\007" + + " \001(\r\022\024\n\014wish_item_id\030\014 \001(\r\022\030\n\020ten_cost_i" + + "tem_id\030\r \001(\rB\033\n\031emu.grasscutter.net.prot" + + "ob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -892,7 +992,7 @@ public emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp getDefaultI internal_static_GachaWishRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GachaWishRsp_descriptor, - new java.lang.String[] { "WishItemId", "GachaScheduleId", "GachaType", "Retcode", "WishMaxProgress", "WishProgress", }); + new java.lang.String[] { "GachaSortId", "Retcode", "GachaType", "GachaScheduleId", "WishItemId", "TenCostItemId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailReqOuterClass.java index 2d7a8fa2930..ac397a5d31d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailReqOuterClass.java @@ -19,15 +19,15 @@ public interface GetAllMailReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_collected = 2; + * bool is_collected = 10; * @return The isCollected. */ boolean getIsCollected(); } /** * 
-   * CmdId: 29228
-   * Obf: OCHDJHKDENA
+   * obf: LHBLADHONLO
+   * CmdId: 26533
    *
* * Protobuf type {@code GetAllMailReq} @@ -74,7 +74,7 @@ private GetAllMailReq( case 0: done = true; break; - case 16: { + case 80: { isCollected_ = input.readBool(); break; @@ -111,10 +111,10 @@ private GetAllMailReq( emu.grasscutter.net.proto.GetAllMailReqOuterClass.GetAllMailReq.class, emu.grasscutter.net.proto.GetAllMailReqOuterClass.GetAllMailReq.Builder.class); } - public static final int IS_COLLECTED_FIELD_NUMBER = 2; + public static final int IS_COLLECTED_FIELD_NUMBER = 10; private boolean isCollected_; /** - * bool is_collected = 2; + * bool is_collected = 10; * @return The isCollected. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (isCollected_ != false) { - output.writeBool(2, isCollected_); + output.writeBool(10, isCollected_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (isCollected_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, isCollected_); + .computeBoolSize(10, isCollected_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -280,8 +280,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29228
-     * Obf: OCHDJHKDENA
+     * obf: LHBLADHONLO
+     * CmdId: 26533
      *
* * Protobuf type {@code GetAllMailReq} @@ -432,7 +432,7 @@ public Builder mergeFrom( private boolean isCollected_ ; /** - * bool is_collected = 2; + * bool is_collected = 10; * @return The isCollected. */ @java.lang.Override @@ -440,7 +440,7 @@ public boolean getIsCollected() { return isCollected_; } /** - * bool is_collected = 2; + * bool is_collected = 10; * @param value The isCollected to set. * @return This builder for chaining. */ @@ -451,7 +451,7 @@ public Builder setIsCollected(boolean value) { return this; } /** - * bool is_collected = 2; + * bool is_collected = 10; * @return This builder for chaining. */ public Builder clearIsCollected() { @@ -528,7 +528,7 @@ public emu.grasscutter.net.proto.GetAllMailReqOuterClass.GetAllMailReq getDefaul static { java.lang.String[] descriptorData = { "\n\023GetAllMailReq.proto\"%\n\rGetAllMailReq\022\024" + - "\n\014is_collected\030\002 \001(\010B\033\n\031emu.grasscutter." + + "\n\014is_collected\030\n \001(\010B\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetAuthkeyReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAuthkeyReqOuterClass.java index 11136385dae..0110ed332d0 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetAuthkeyReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAuthkeyReqOuterClass.java @@ -19,33 +19,33 @@ public interface GetAuthkeyReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 PGANJHDNINM = 7; - * @return The pGANJHDNINM. - */ - int getPGANJHDNINM(); - - /** - * string auth_appid = 2; + * string auth_appid = 10; * @return The authAppid. */ java.lang.String getAuthAppid(); /** - * string auth_appid = 2; + * string auth_appid = 10; * @return The bytes for authAppid. */ com.google.protobuf.ByteString getAuthAppidBytes(); /** - * uint32 BIGHJAIBJJK = 14; - * @return The bIGHJAIBJJK. + * uint32 CIJPMGMCJBA = 1; + * @return The cIJPMGMCJBA. */ - int getBIGHJAIBJJK(); + int getCIJPMGMCJBA(); + + /** + * uint32 MPGMOFLCEOF = 2; + * @return The mPGMOFLCEOF. + */ + int getMPGMOFLCEOF(); } /** * 
-   * CmdId: 27875
-   * Obf: DCPMJKGKCGE
+   * CmdId: 28308
+   * obf: PGAFHBLJDKK
    *
* * Protobuf type {@code GetAuthkeyReq} @@ -93,20 +93,20 @@ private GetAuthkeyReq( case 0: done = true; break; - case 18: { - java.lang.String s = input.readStringRequireUtf8(); + case 8: { - authAppid_ = s; + cIJPMGMCJBA_ = input.readUInt32(); break; } - case 56: { + case 16: { - pGANJHDNINM_ = input.readUInt32(); + mPGMOFLCEOF_ = input.readUInt32(); break; } - case 112: { + case 82: { + java.lang.String s = input.readStringRequireUtf8(); - bIGHJAIBJJK_ = input.readUInt32(); + authAppid_ = s; break; } default: { @@ -141,21 +141,10 @@ private GetAuthkeyReq( emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq.class, emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq.Builder.class); } - public static final int PGANJHDNINM_FIELD_NUMBER = 7; - private int pGANJHDNINM_; - /** - * uint32 PGANJHDNINM = 7; - * @return The pGANJHDNINM. - */ - @java.lang.Override - public int getPGANJHDNINM() { - return pGANJHDNINM_; - } - - public static final int AUTH_APPID_FIELD_NUMBER = 2; + public static final int AUTH_APPID_FIELD_NUMBER = 10; private volatile java.lang.Object authAppid_; /** - * string auth_appid = 2; + * string auth_appid = 10; * @return The authAppid. */ @java.lang.Override @@ -172,7 +161,7 @@ public java.lang.String getAuthAppid() { } } /** - * string auth_appid = 2; + * string auth_appid = 10; * @return The bytes for authAppid. */ @java.lang.Override @@ -190,15 +179,26 @@ public java.lang.String getAuthAppid() { } } - public static final int BIGHJAIBJJK_FIELD_NUMBER = 14; - private int bIGHJAIBJJK_; + public static final int CIJPMGMCJBA_FIELD_NUMBER = 1; + private int cIJPMGMCJBA_; + /** + * uint32 CIJPMGMCJBA = 1; + * @return The cIJPMGMCJBA. + */ + @java.lang.Override + public int getCIJPMGMCJBA() { + return cIJPMGMCJBA_; + } + + public static final int MPGMOFLCEOF_FIELD_NUMBER = 2; + private int mPGMOFLCEOF_; /** - * uint32 BIGHJAIBJJK = 14; - * @return The bIGHJAIBJJK. + * uint32 MPGMOFLCEOF = 2; + * @return The mPGMOFLCEOF. */ @java.lang.Override - public int getBIGHJAIBJJK() { - return bIGHJAIBJJK_; + public int getMPGMOFLCEOF() { + return mPGMOFLCEOF_; } private byte memoizedIsInitialized = -1; @@ -215,14 +215,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authAppid_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, authAppid_); + if (cIJPMGMCJBA_ != 0) { + output.writeUInt32(1, cIJPMGMCJBA_); } - if (pGANJHDNINM_ != 0) { - output.writeUInt32(7, pGANJHDNINM_); + if (mPGMOFLCEOF_ != 0) { + output.writeUInt32(2, mPGMOFLCEOF_); } - if (bIGHJAIBJJK_ != 0) { - output.writeUInt32(14, bIGHJAIBJJK_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authAppid_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 10, authAppid_); } unknownFields.writeTo(output); } @@ -233,16 +233,16 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authAppid_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, authAppid_); - } - if (pGANJHDNINM_ != 0) { + if (cIJPMGMCJBA_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, pGANJHDNINM_); + .computeUInt32Size(1, cIJPMGMCJBA_); } - if (bIGHJAIBJJK_ != 0) { + if (mPGMOFLCEOF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, bIGHJAIBJJK_); + .computeUInt32Size(2, mPGMOFLCEOF_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authAppid_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, authAppid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -259,12 +259,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq other = (emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq) obj; - if (getPGANJHDNINM() - != other.getPGANJHDNINM()) return false; if (!getAuthAppid() .equals(other.getAuthAppid())) return false; - if (getBIGHJAIBJJK() - != other.getBIGHJAIBJJK()) return false; + if (getCIJPMGMCJBA() + != other.getCIJPMGMCJBA()) return false; + if (getMPGMOFLCEOF() + != other.getMPGMOFLCEOF()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -276,12 +276,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PGANJHDNINM_FIELD_NUMBER; - hash = (53 * hash) + getPGANJHDNINM(); hash = (37 * hash) + AUTH_APPID_FIELD_NUMBER; hash = (53 * hash) + getAuthAppid().hashCode(); - hash = (37 * hash) + BIGHJAIBJJK_FIELD_NUMBER; - hash = (53 * hash) + getBIGHJAIBJJK(); + hash = (37 * hash) + CIJPMGMCJBA_FIELD_NUMBER; + hash = (53 * hash) + getCIJPMGMCJBA(); + hash = (37 * hash) + MPGMOFLCEOF_FIELD_NUMBER; + hash = (53 * hash) + getMPGMOFLCEOF(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -379,8 +379,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27875
-     * Obf: DCPMJKGKCGE
+     * CmdId: 28308
+     * obf: PGAFHBLJDKK
      *
* * Protobuf type {@code GetAuthkeyReq} @@ -420,11 +420,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pGANJHDNINM_ = 0; - authAppid_ = ""; - bIGHJAIBJJK_ = 0; + cIJPMGMCJBA_ = 0; + + mPGMOFLCEOF_ = 0; return this; } @@ -452,9 +452,9 @@ public emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq build() { @java.lang.Override public emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq buildPartial() { emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq result = new emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq(this); - result.pGANJHDNINM_ = pGANJHDNINM_; result.authAppid_ = authAppid_; - result.bIGHJAIBJJK_ = bIGHJAIBJJK_; + result.cIJPMGMCJBA_ = cIJPMGMCJBA_; + result.mPGMOFLCEOF_ = mPGMOFLCEOF_; onBuilt(); return result; } @@ -503,15 +503,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq other) { if (other == emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq.getDefaultInstance()) return this; - if (other.getPGANJHDNINM() != 0) { - setPGANJHDNINM(other.getPGANJHDNINM()); - } if (!other.getAuthAppid().isEmpty()) { authAppid_ = other.authAppid_; onChanged(); } - if (other.getBIGHJAIBJJK() != 0) { - setBIGHJAIBJJK(other.getBIGHJAIBJJK()); + if (other.getCIJPMGMCJBA() != 0) { + setCIJPMGMCJBA(other.getCIJPMGMCJBA()); + } + if (other.getMPGMOFLCEOF() != 0) { + setMPGMOFLCEOF(other.getMPGMOFLCEOF()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -542,40 +542,9 @@ public Builder mergeFrom( return this; } - private int pGANJHDNINM_ ; - /** - * uint32 PGANJHDNINM = 7; - * @return The pGANJHDNINM. - */ - @java.lang.Override - public int getPGANJHDNINM() { - return pGANJHDNINM_; - } - /** - * uint32 PGANJHDNINM = 7; - * @param value The pGANJHDNINM to set. - * @return This builder for chaining. - */ - public Builder setPGANJHDNINM(int value) { - - pGANJHDNINM_ = value; - onChanged(); - return this; - } - /** - * uint32 PGANJHDNINM = 7; - * @return This builder for chaining. - */ - public Builder clearPGANJHDNINM() { - - pGANJHDNINM_ = 0; - onChanged(); - return this; - } - private java.lang.Object authAppid_ = ""; /** - * string auth_appid = 2; + * string auth_appid = 10; * @return The authAppid. */ public java.lang.String getAuthAppid() { @@ -591,7 +560,7 @@ public java.lang.String getAuthAppid() { } } /** - * string auth_appid = 2; + * string auth_appid = 10; * @return The bytes for authAppid. */ public com.google.protobuf.ByteString @@ -608,7 +577,7 @@ public java.lang.String getAuthAppid() { } } /** - * string auth_appid = 2; + * string auth_appid = 10; * @param value The authAppid to set. * @return This builder for chaining. */ @@ -623,7 +592,7 @@ public Builder setAuthAppid( return this; } /** - * string auth_appid = 2; + * string auth_appid = 10; * @return This builder for chaining. */ public Builder clearAuthAppid() { @@ -633,7 +602,7 @@ public Builder clearAuthAppid() { return this; } /** - * string auth_appid = 2; + * string auth_appid = 10; * @param value The bytes for authAppid to set. * @return This builder for chaining. */ @@ -649,33 +618,64 @@ public Builder setAuthAppidBytes( return this; } - private int bIGHJAIBJJK_ ; + private int cIJPMGMCJBA_ ; + /** + * uint32 CIJPMGMCJBA = 1; + * @return The cIJPMGMCJBA. + */ + @java.lang.Override + public int getCIJPMGMCJBA() { + return cIJPMGMCJBA_; + } + /** + * uint32 CIJPMGMCJBA = 1; + * @param value The cIJPMGMCJBA to set. + * @return This builder for chaining. + */ + public Builder setCIJPMGMCJBA(int value) { + + cIJPMGMCJBA_ = value; + onChanged(); + return this; + } + /** + * uint32 CIJPMGMCJBA = 1; + * @return This builder for chaining. + */ + public Builder clearCIJPMGMCJBA() { + + cIJPMGMCJBA_ = 0; + onChanged(); + return this; + } + + private int mPGMOFLCEOF_ ; /** - * uint32 BIGHJAIBJJK = 14; - * @return The bIGHJAIBJJK. + * uint32 MPGMOFLCEOF = 2; + * @return The mPGMOFLCEOF. */ @java.lang.Override - public int getBIGHJAIBJJK() { - return bIGHJAIBJJK_; + public int getMPGMOFLCEOF() { + return mPGMOFLCEOF_; } /** - * uint32 BIGHJAIBJJK = 14; - * @param value The bIGHJAIBJJK to set. + * uint32 MPGMOFLCEOF = 2; + * @param value The mPGMOFLCEOF to set. * @return This builder for chaining. */ - public Builder setBIGHJAIBJJK(int value) { + public Builder setMPGMOFLCEOF(int value) { - bIGHJAIBJJK_ = value; + mPGMOFLCEOF_ = value; onChanged(); return this; } /** - * uint32 BIGHJAIBJJK = 14; + * uint32 MPGMOFLCEOF = 2; * @return This builder for chaining. */ - public Builder clearBIGHJAIBJJK() { + public Builder clearMPGMOFLCEOF() { - bIGHJAIBJJK_ = 0; + mPGMOFLCEOF_ = 0; onChanged(); return this; } @@ -746,9 +746,9 @@ public emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq getDefaul descriptor; static { java.lang.String[] descriptorData = { - "\n\023GetAuthkeyReq.proto\"M\n\rGetAuthkeyReq\022\023" + - "\n\013PGANJHDNINM\030\007 \001(\r\022\022\n\nauth_appid\030\002 \001(\t\022" + - "\023\n\013BIGHJAIBJJK\030\016 \001(\rB\033\n\031emu.grasscutter." + + "\n\023GetAuthkeyReq.proto\"M\n\rGetAuthkeyReq\022\022" + + "\n\nauth_appid\030\n \001(\t\022\023\n\013CIJPMGMCJBA\030\001 \001(\r\022" + + "\023\n\013MPGMOFLCEOF\030\002 \001(\rB\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -760,7 +760,7 @@ public emu.grasscutter.net.proto.GetAuthkeyReqOuterClass.GetAuthkeyReq getDefaul internal_static_GetAuthkeyReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GetAuthkeyReq_descriptor, - new java.lang.String[] { "PGANJHDNINM", "AuthAppid", "BIGHJAIBJJK", }); + new java.lang.String[] { "AuthAppid", "CIJPMGMCJBA", "MPGMOFLCEOF", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetAuthkeyRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAuthkeyRspOuterClass.java index a9af63e1e7b..5e78a2df944 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetAuthkeyRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAuthkeyRspOuterClass.java @@ -19,54 +19,54 @@ public interface GetAuthkeyRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 PGANJHDNINM = 7; - * @return The pGANJHDNINM. + * int32 retcode = 4; + * @return The retcode. */ - int getPGANJHDNINM(); + int getRetcode(); /** - * string authkey = 12; - * @return The authkey. + * string auth_appid = 5; + * @return The authAppid. */ - java.lang.String getAuthkey(); + java.lang.String getAuthAppid(); /** - * string authkey = 12; - * @return The bytes for authkey. + * string auth_appid = 5; + * @return The bytes for authAppid. */ com.google.protobuf.ByteString - getAuthkeyBytes(); + getAuthAppidBytes(); /** - * uint32 BIGHJAIBJJK = 2; - * @return The bIGHJAIBJJK. + * uint32 MPGMOFLCEOF = 6; + * @return The mPGMOFLCEOF. */ - int getBIGHJAIBJJK(); + int getMPGMOFLCEOF(); /** - * int32 retcode = 9; - * @return The retcode. + * uint32 CIJPMGMCJBA = 11; + * @return The cIJPMGMCJBA. */ - int getRetcode(); + int getCIJPMGMCJBA(); /** - * string auth_appid = 5; - * @return The authAppid. + * string authkey = 13; + * @return The authkey. */ - java.lang.String getAuthAppid(); + java.lang.String getAuthkey(); /** - * string auth_appid = 5; - * @return The bytes for authAppid. + * string authkey = 13; + * @return The bytes for authkey. */ com.google.protobuf.ByteString - getAuthAppidBytes(); + getAuthkeyBytes(); /** - * string game_biz = 1; + * string game_biz = 15; * @return The gameBiz. */ java.lang.String getGameBiz(); /** - * string game_biz = 1; + * string game_biz = 15; * @return The bytes for gameBiz. */ com.google.protobuf.ByteString @@ -74,8 +74,8 @@ public interface GetAuthkeyRspOrBuilder extends } /** * 
-   * CmdId: 29353
-   * Obf: KNBBKOGAAHL
+   * CmdId: 154
+   * obf: CMLAFDBCKJA
    *
* * Protobuf type {@code GetAuthkeyRsp} @@ -90,8 +90,8 @@ private GetAuthkeyRsp(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } private GetAuthkeyRsp() { - authkey_ = ""; authAppid_ = ""; + authkey_ = ""; gameBiz_ = ""; } @@ -125,15 +125,9 @@ private GetAuthkeyRsp( case 0: done = true; break; - case 10: { - java.lang.String s = input.readStringRequireUtf8(); - - gameBiz_ = s; - break; - } - case 16: { + case 32: { - bIGHJAIBJJK_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } case 42: { @@ -142,22 +136,28 @@ private GetAuthkeyRsp( authAppid_ = s; break; } - case 56: { + case 48: { - pGANJHDNINM_ = input.readUInt32(); + mPGMOFLCEOF_ = input.readUInt32(); break; } - case 72: { + case 88: { - retcode_ = input.readInt32(); + cIJPMGMCJBA_ = input.readUInt32(); break; } - case 98: { + case 106: { java.lang.String s = input.readStringRequireUtf8(); authkey_ = s; break; } + case 122: { + java.lang.String s = input.readStringRequireUtf8(); + + gameBiz_ = s; + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -190,119 +190,119 @@ private GetAuthkeyRsp( emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp.class, emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp.Builder.class); } - public static final int PGANJHDNINM_FIELD_NUMBER = 7; - private int pGANJHDNINM_; + public static final int RETCODE_FIELD_NUMBER = 4; + private int retcode_; /** - * uint32 PGANJHDNINM = 7; - * @return The pGANJHDNINM. + * int32 retcode = 4; + * @return The retcode. */ @java.lang.Override - public int getPGANJHDNINM() { - return pGANJHDNINM_; + public int getRetcode() { + return retcode_; } - public static final int AUTHKEY_FIELD_NUMBER = 12; - private volatile java.lang.Object authkey_; + public static final int AUTH_APPID_FIELD_NUMBER = 5; + private volatile java.lang.Object authAppid_; /** - * string authkey = 12; - * @return The authkey. + * string auth_appid = 5; + * @return The authAppid. */ @java.lang.Override - public java.lang.String getAuthkey() { - java.lang.Object ref = authkey_; + public java.lang.String getAuthAppid() { + java.lang.Object ref = authAppid_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - authkey_ = s; + authAppid_ = s; return s; } } /** - * string authkey = 12; - * @return The bytes for authkey. + * string auth_appid = 5; + * @return The bytes for authAppid. */ @java.lang.Override public com.google.protobuf.ByteString - getAuthkeyBytes() { - java.lang.Object ref = authkey_; + getAuthAppidBytes() { + java.lang.Object ref = authAppid_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - authkey_ = b; + authAppid_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int BIGHJAIBJJK_FIELD_NUMBER = 2; - private int bIGHJAIBJJK_; + public static final int MPGMOFLCEOF_FIELD_NUMBER = 6; + private int mPGMOFLCEOF_; /** - * uint32 BIGHJAIBJJK = 2; - * @return The bIGHJAIBJJK. + * uint32 MPGMOFLCEOF = 6; + * @return The mPGMOFLCEOF. */ @java.lang.Override - public int getBIGHJAIBJJK() { - return bIGHJAIBJJK_; + public int getMPGMOFLCEOF() { + return mPGMOFLCEOF_; } - public static final int RETCODE_FIELD_NUMBER = 9; - private int retcode_; + public static final int CIJPMGMCJBA_FIELD_NUMBER = 11; + private int cIJPMGMCJBA_; /** - * int32 retcode = 9; - * @return The retcode. + * uint32 CIJPMGMCJBA = 11; + * @return The cIJPMGMCJBA. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getCIJPMGMCJBA() { + return cIJPMGMCJBA_; } - public static final int AUTH_APPID_FIELD_NUMBER = 5; - private volatile java.lang.Object authAppid_; + public static final int AUTHKEY_FIELD_NUMBER = 13; + private volatile java.lang.Object authkey_; /** - * string auth_appid = 5; - * @return The authAppid. + * string authkey = 13; + * @return The authkey. */ @java.lang.Override - public java.lang.String getAuthAppid() { - java.lang.Object ref = authAppid_; + public java.lang.String getAuthkey() { + java.lang.Object ref = authkey_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - authAppid_ = s; + authkey_ = s; return s; } } /** - * string auth_appid = 5; - * @return The bytes for authAppid. + * string authkey = 13; + * @return The bytes for authkey. */ @java.lang.Override public com.google.protobuf.ByteString - getAuthAppidBytes() { - java.lang.Object ref = authAppid_; + getAuthkeyBytes() { + java.lang.Object ref = authkey_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - authAppid_ = b; + authkey_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int GAME_BIZ_FIELD_NUMBER = 1; + public static final int GAME_BIZ_FIELD_NUMBER = 15; private volatile java.lang.Object gameBiz_; /** - * string game_biz = 1; + * string game_biz = 15; * @return The gameBiz. */ @java.lang.Override @@ -319,7 +319,7 @@ public java.lang.String getGameBiz() { } } /** - * string game_biz = 1; + * string game_biz = 15; * @return The bytes for gameBiz. */ @java.lang.Override @@ -351,23 +351,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, gameBiz_); - } - if (bIGHJAIBJJK_ != 0) { - output.writeUInt32(2, bIGHJAIBJJK_); + if (retcode_ != 0) { + output.writeInt32(4, retcode_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authAppid_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, authAppid_); } - if (pGANJHDNINM_ != 0) { - output.writeUInt32(7, pGANJHDNINM_); + if (mPGMOFLCEOF_ != 0) { + output.writeUInt32(6, mPGMOFLCEOF_); } - if (retcode_ != 0) { - output.writeInt32(9, retcode_); + if (cIJPMGMCJBA_ != 0) { + output.writeUInt32(11, cIJPMGMCJBA_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authkey_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 12, authkey_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 13, authkey_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 15, gameBiz_); } unknownFields.writeTo(output); } @@ -378,26 +378,26 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, gameBiz_); - } - if (bIGHJAIBJJK_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, bIGHJAIBJJK_); + .computeInt32Size(4, retcode_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authAppid_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, authAppid_); } - if (pGANJHDNINM_ != 0) { + if (mPGMOFLCEOF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, pGANJHDNINM_); + .computeUInt32Size(6, mPGMOFLCEOF_); } - if (retcode_ != 0) { + if (cIJPMGMCJBA_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, retcode_); + .computeUInt32Size(11, cIJPMGMCJBA_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(authkey_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, authkey_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, authkey_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, gameBiz_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -414,16 +414,16 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp other = (emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp) obj; - if (getPGANJHDNINM() - != other.getPGANJHDNINM()) return false; - if (!getAuthkey() - .equals(other.getAuthkey())) return false; - if (getBIGHJAIBJJK() - != other.getBIGHJAIBJJK()) return false; if (getRetcode() != other.getRetcode()) return false; if (!getAuthAppid() .equals(other.getAuthAppid())) return false; + if (getMPGMOFLCEOF() + != other.getMPGMOFLCEOF()) return false; + if (getCIJPMGMCJBA() + != other.getCIJPMGMCJBA()) return false; + if (!getAuthkey() + .equals(other.getAuthkey())) return false; if (!getGameBiz() .equals(other.getGameBiz())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -437,16 +437,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PGANJHDNINM_FIELD_NUMBER; - hash = (53 * hash) + getPGANJHDNINM(); - hash = (37 * hash) + AUTHKEY_FIELD_NUMBER; - hash = (53 * hash) + getAuthkey().hashCode(); - hash = (37 * hash) + BIGHJAIBJJK_FIELD_NUMBER; - hash = (53 * hash) + getBIGHJAIBJJK(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (37 * hash) + AUTH_APPID_FIELD_NUMBER; hash = (53 * hash) + getAuthAppid().hashCode(); + hash = (37 * hash) + MPGMOFLCEOF_FIELD_NUMBER; + hash = (53 * hash) + getMPGMOFLCEOF(); + hash = (37 * hash) + CIJPMGMCJBA_FIELD_NUMBER; + hash = (53 * hash) + getCIJPMGMCJBA(); + hash = (37 * hash) + AUTHKEY_FIELD_NUMBER; + hash = (53 * hash) + getAuthkey().hashCode(); hash = (37 * hash) + GAME_BIZ_FIELD_NUMBER; hash = (53 * hash) + getGameBiz().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); @@ -546,8 +546,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29353
-     * Obf: KNBBKOGAAHL
+     * CmdId: 154
+     * obf: CMLAFDBCKJA
      *
* * Protobuf type {@code GetAuthkeyRsp} @@ -587,15 +587,15 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pGANJHDNINM_ = 0; + retcode_ = 0; - authkey_ = ""; + authAppid_ = ""; - bIGHJAIBJJK_ = 0; + mPGMOFLCEOF_ = 0; - retcode_ = 0; + cIJPMGMCJBA_ = 0; - authAppid_ = ""; + authkey_ = ""; gameBiz_ = ""; @@ -625,11 +625,11 @@ public emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp build() { @java.lang.Override public emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp buildPartial() { emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp result = new emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp(this); - result.pGANJHDNINM_ = pGANJHDNINM_; - result.authkey_ = authkey_; - result.bIGHJAIBJJK_ = bIGHJAIBJJK_; result.retcode_ = retcode_; result.authAppid_ = authAppid_; + result.mPGMOFLCEOF_ = mPGMOFLCEOF_; + result.cIJPMGMCJBA_ = cIJPMGMCJBA_; + result.authkey_ = authkey_; result.gameBiz_ = gameBiz_; onBuilt(); return result; @@ -679,16 +679,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp other) { if (other == emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp.getDefaultInstance()) return this; - if (other.getPGANJHDNINM() != 0) { - setPGANJHDNINM(other.getPGANJHDNINM()); - } - if (!other.getAuthkey().isEmpty()) { - authkey_ = other.authkey_; - onChanged(); - } - if (other.getBIGHJAIBJJK() != 0) { - setBIGHJAIBJJK(other.getBIGHJAIBJJK()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } @@ -696,6 +686,16 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAu authAppid_ = other.authAppid_; onChanged(); } + if (other.getMPGMOFLCEOF() != 0) { + setMPGMOFLCEOF(other.getMPGMOFLCEOF()); + } + if (other.getCIJPMGMCJBA() != 0) { + setCIJPMGMCJBA(other.getCIJPMGMCJBA()); + } + if (!other.getAuthkey().isEmpty()) { + authkey_ = other.authkey_; + onChanged(); + } if (!other.getGameBiz().isEmpty()) { gameBiz_ = other.gameBiz_; onChanged(); @@ -729,254 +729,254 @@ public Builder mergeFrom( return this; } - private int pGANJHDNINM_ ; + private int retcode_ ; /** - * uint32 PGANJHDNINM = 7; - * @return The pGANJHDNINM. + * int32 retcode = 4; + * @return The retcode. */ @java.lang.Override - public int getPGANJHDNINM() { - return pGANJHDNINM_; + public int getRetcode() { + return retcode_; } /** - * uint32 PGANJHDNINM = 7; - * @param value The pGANJHDNINM to set. + * int32 retcode = 4; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setPGANJHDNINM(int value) { + public Builder setRetcode(int value) { - pGANJHDNINM_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 PGANJHDNINM = 7; + * int32 retcode = 4; * @return This builder for chaining. */ - public Builder clearPGANJHDNINM() { + public Builder clearRetcode() { - pGANJHDNINM_ = 0; + retcode_ = 0; onChanged(); return this; } - private java.lang.Object authkey_ = ""; + private java.lang.Object authAppid_ = ""; /** - * string authkey = 12; - * @return The authkey. + * string auth_appid = 5; + * @return The authAppid. */ - public java.lang.String getAuthkey() { - java.lang.Object ref = authkey_; + public java.lang.String getAuthAppid() { + java.lang.Object ref = authAppid_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - authkey_ = s; + authAppid_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string authkey = 12; - * @return The bytes for authkey. + * string auth_appid = 5; + * @return The bytes for authAppid. */ public com.google.protobuf.ByteString - getAuthkeyBytes() { - java.lang.Object ref = authkey_; + getAuthAppidBytes() { + java.lang.Object ref = authAppid_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - authkey_ = b; + authAppid_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string authkey = 12; - * @param value The authkey to set. + * string auth_appid = 5; + * @param value The authAppid to set. * @return This builder for chaining. */ - public Builder setAuthkey( + public Builder setAuthAppid( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - authkey_ = value; + authAppid_ = value; onChanged(); return this; } /** - * string authkey = 12; + * string auth_appid = 5; * @return This builder for chaining. */ - public Builder clearAuthkey() { + public Builder clearAuthAppid() { - authkey_ = getDefaultInstance().getAuthkey(); + authAppid_ = getDefaultInstance().getAuthAppid(); onChanged(); return this; } /** - * string authkey = 12; - * @param value The bytes for authkey to set. + * string auth_appid = 5; + * @param value The bytes for authAppid to set. * @return This builder for chaining. */ - public Builder setAuthkeyBytes( + public Builder setAuthAppidBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - authkey_ = value; + authAppid_ = value; onChanged(); return this; } - private int bIGHJAIBJJK_ ; + private int mPGMOFLCEOF_ ; /** - * uint32 BIGHJAIBJJK = 2; - * @return The bIGHJAIBJJK. + * uint32 MPGMOFLCEOF = 6; + * @return The mPGMOFLCEOF. */ @java.lang.Override - public int getBIGHJAIBJJK() { - return bIGHJAIBJJK_; + public int getMPGMOFLCEOF() { + return mPGMOFLCEOF_; } /** - * uint32 BIGHJAIBJJK = 2; - * @param value The bIGHJAIBJJK to set. + * uint32 MPGMOFLCEOF = 6; + * @param value The mPGMOFLCEOF to set. * @return This builder for chaining. */ - public Builder setBIGHJAIBJJK(int value) { + public Builder setMPGMOFLCEOF(int value) { - bIGHJAIBJJK_ = value; + mPGMOFLCEOF_ = value; onChanged(); return this; } /** - * uint32 BIGHJAIBJJK = 2; + * uint32 MPGMOFLCEOF = 6; * @return This builder for chaining. */ - public Builder clearBIGHJAIBJJK() { + public Builder clearMPGMOFLCEOF() { - bIGHJAIBJJK_ = 0; + mPGMOFLCEOF_ = 0; onChanged(); return this; } - private int retcode_ ; + private int cIJPMGMCJBA_ ; /** - * int32 retcode = 9; - * @return The retcode. + * uint32 CIJPMGMCJBA = 11; + * @return The cIJPMGMCJBA. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getCIJPMGMCJBA() { + return cIJPMGMCJBA_; } /** - * int32 retcode = 9; - * @param value The retcode to set. + * uint32 CIJPMGMCJBA = 11; + * @param value The cIJPMGMCJBA to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setCIJPMGMCJBA(int value) { - retcode_ = value; + cIJPMGMCJBA_ = value; onChanged(); return this; } /** - * int32 retcode = 9; + * uint32 CIJPMGMCJBA = 11; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearCIJPMGMCJBA() { - retcode_ = 0; + cIJPMGMCJBA_ = 0; onChanged(); return this; } - private java.lang.Object authAppid_ = ""; + private java.lang.Object authkey_ = ""; /** - * string auth_appid = 5; - * @return The authAppid. + * string authkey = 13; + * @return The authkey. */ - public java.lang.String getAuthAppid() { - java.lang.Object ref = authAppid_; + public java.lang.String getAuthkey() { + java.lang.Object ref = authkey_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - authAppid_ = s; + authkey_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string auth_appid = 5; - * @return The bytes for authAppid. + * string authkey = 13; + * @return The bytes for authkey. */ public com.google.protobuf.ByteString - getAuthAppidBytes() { - java.lang.Object ref = authAppid_; + getAuthkeyBytes() { + java.lang.Object ref = authkey_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - authAppid_ = b; + authkey_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string auth_appid = 5; - * @param value The authAppid to set. + * string authkey = 13; + * @param value The authkey to set. * @return This builder for chaining. */ - public Builder setAuthAppid( + public Builder setAuthkey( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - authAppid_ = value; + authkey_ = value; onChanged(); return this; } /** - * string auth_appid = 5; + * string authkey = 13; * @return This builder for chaining. */ - public Builder clearAuthAppid() { + public Builder clearAuthkey() { - authAppid_ = getDefaultInstance().getAuthAppid(); + authkey_ = getDefaultInstance().getAuthkey(); onChanged(); return this; } /** - * string auth_appid = 5; - * @param value The bytes for authAppid to set. + * string authkey = 13; + * @param value The bytes for authkey to set. * @return This builder for chaining. */ - public Builder setAuthAppidBytes( + public Builder setAuthkeyBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - authAppid_ = value; + authkey_ = value; onChanged(); return this; } private java.lang.Object gameBiz_ = ""; /** - * string game_biz = 1; + * string game_biz = 15; * @return The gameBiz. */ public java.lang.String getGameBiz() { @@ -992,7 +992,7 @@ public java.lang.String getGameBiz() { } } /** - * string game_biz = 1; + * string game_biz = 15; * @return The bytes for gameBiz. */ public com.google.protobuf.ByteString @@ -1009,7 +1009,7 @@ public java.lang.String getGameBiz() { } } /** - * string game_biz = 1; + * string game_biz = 15; * @param value The gameBiz to set. * @return This builder for chaining. */ @@ -1024,7 +1024,7 @@ public Builder setGameBiz( return this; } /** - * string game_biz = 1; + * string game_biz = 15; * @return This builder for chaining. */ public Builder clearGameBiz() { @@ -1034,7 +1034,7 @@ public Builder clearGameBiz() { return this; } /** - * string game_biz = 1; + * string game_biz = 15; * @param value The bytes for gameBiz to set. * @return This builder for chaining. */ @@ -1117,9 +1117,9 @@ public emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp getDefaul static { java.lang.String[] descriptorData = { "\n\023GetAuthkeyRsp.proto\"\201\001\n\rGetAuthkeyRsp\022" + - "\023\n\013PGANJHDNINM\030\007 \001(\r\022\017\n\007authkey\030\014 \001(\t\022\023\n" + - "\013BIGHJAIBJJK\030\002 \001(\r\022\017\n\007retcode\030\t \001(\005\022\022\n\na" + - "uth_appid\030\005 \001(\t\022\020\n\010game_biz\030\001 \001(\tB\033\n\031emu" + + "\017\n\007retcode\030\004 \001(\005\022\022\n\nauth_appid\030\005 \001(\t\022\023\n\013" + + "MPGMOFLCEOF\030\006 \001(\r\022\023\n\013CIJPMGMCJBA\030\013 \001(\r\022\017" + + "\n\007authkey\030\r \001(\t\022\020\n\010game_biz\030\017 \001(\tB\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1131,7 +1131,7 @@ public emu.grasscutter.net.proto.GetAuthkeyRspOuterClass.GetAuthkeyRsp getDefaul internal_static_GetAuthkeyRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GetAuthkeyRsp_descriptor, - new java.lang.String[] { "PGANJHDNINM", "Authkey", "BIGHJAIBJJK", "Retcode", "AuthAppid", "GameBiz", }); + new java.lang.String[] { "Retcode", "AuthAppid", "MPGMOFLCEOF", "CIJPMGMCJBA", "Authkey", "GameBiz", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetCompoundDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetCompoundDataRspOuterClass.java index 918038e9752..db1076a0f90 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetCompoundDataRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetCompoundDataRspOuterClass.java @@ -19,56 +19,56 @@ public interface GetCompoundDataRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 14; + * int32 retcode = 1; * @return The retcode. */ int getRetcode(); /** - * repeated uint32 unlockCompoundList = 9; - * @return A list containing the unlockCompoundList. - */ - java.util.List getUnlockCompoundListList(); - /** - * repeated uint32 unlockCompoundList = 9; - * @return The count of unlockCompoundList. - */ - int getUnlockCompoundListCount(); - /** - * repeated uint32 unlockCompoundList = 9; - * @param index The index of the element to return. - * @return The unlockCompoundList at the given index. - */ - int getUnlockCompoundList(int index); - - /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ java.util.List getCompoundQueueDataListList(); /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueDataList(int index); /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ int getCompoundQueueDataListCount(); /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ java.util.List getCompoundQueueDataListOrBuilderList(); /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataListOrBuilder( int index); + + /** + * repeated uint32 unlockCompoundList = 14; + * @return A list containing the unlockCompoundList. + */ + java.util.List getUnlockCompoundListList(); + /** + * repeated uint32 unlockCompoundList = 14; + * @return The count of unlockCompoundList. + */ + int getUnlockCompoundListCount(); + /** + * repeated uint32 unlockCompoundList = 14; + * @param index The index of the element to return. + * @return The unlockCompoundList at the given index. + */ + int getUnlockCompoundList(int index); } /** * 
-   * CmdId: 24302
-   * Obf: AFFGNHAFPID
+   * CmdId: 4557
+   * obf: NIKJBKDFCDL
    *
* * Protobuf type {@code GetCompoundDataRsp} @@ -83,8 +83,8 @@ private GetCompoundDataRsp(com.google.protobuf.GeneratedMessageV3.Builder bui super(builder); } private GetCompoundDataRsp() { - unlockCompoundList_ = emptyIntList(); compoundQueueDataList_ = java.util.Collections.emptyList(); + unlockCompoundList_ = emptyIntList(); } @java.lang.Override @@ -118,20 +118,34 @@ private GetCompoundDataRsp( case 0: done = true; break; - case 72: { + case 8: { + + retcode_ = input.readInt32(); + break; + } + case 82: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - unlockCompoundList_ = newIntList(); + compoundQueueDataList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } + compoundQueueDataList_.add( + input.readMessage(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.parser(), extensionRegistry)); + break; + } + case 112: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + unlockCompoundList_ = newIntList(); + mutable_bitField0_ |= 0x00000002; + } unlockCompoundList_.addInt(input.readUInt32()); break; } - case 74: { + case 114: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { unlockCompoundList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { unlockCompoundList_.addInt(input.readUInt32()); @@ -139,20 +153,6 @@ private GetCompoundDataRsp( input.popLimit(limit); break; } - case 98: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - compoundQueueDataList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - compoundQueueDataList_.add( - input.readMessage(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.parser(), extensionRegistry)); - break; - } - case 112: { - - retcode_ = input.readInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -169,10 +169,10 @@ private GetCompoundDataRsp( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - unlockCompoundList_.makeImmutable(); // C + compoundQueueDataList_ = java.util.Collections.unmodifiableList(compoundQueueDataList_); } if (((mutable_bitField0_ & 0x00000002) != 0)) { - compoundQueueDataList_ = java.util.Collections.unmodifiableList(compoundQueueDataList_); + unlockCompoundList_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -191,10 +191,10 @@ private GetCompoundDataRsp( emu.grasscutter.net.proto.GetCompoundDataRspOuterClass.GetCompoundDataRsp.class, emu.grasscutter.net.proto.GetCompoundDataRspOuterClass.GetCompoundDataRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 14; + public static final int RETCODE_FIELD_NUMBER = 1; private int retcode_; /** - * int32 retcode = 14; + * int32 retcode = 1; * @return The retcode. */ @java.lang.Override @@ -202,45 +202,17 @@ public int getRetcode() { return retcode_; } - public static final int UNLOCKCOMPOUNDLIST_FIELD_NUMBER = 9; - private com.google.protobuf.Internal.IntList unlockCompoundList_; - /** - * repeated uint32 unlockCompoundList = 9; - * @return A list containing the unlockCompoundList. - */ - @java.lang.Override - public java.util.List - getUnlockCompoundListList() { - return unlockCompoundList_; - } - /** - * repeated uint32 unlockCompoundList = 9; - * @return The count of unlockCompoundList. - */ - public int getUnlockCompoundListCount() { - return unlockCompoundList_.size(); - } - /** - * repeated uint32 unlockCompoundList = 9; - * @param index The index of the element to return. - * @return The unlockCompoundList at the given index. - */ - public int getUnlockCompoundList(int index) { - return unlockCompoundList_.getInt(index); - } - private int unlockCompoundListMemoizedSerializedSize = -1; - - public static final int COMPOUNDQUEUEDATALIST_FIELD_NUMBER = 12; + public static final int COMPOUNDQUEUEDATALIST_FIELD_NUMBER = 10; private java.util.List compoundQueueDataList_; /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ @java.lang.Override public java.util.List getCompoundQueueDataListList() { return compoundQueueDataList_; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ @java.lang.Override public java.util.List @@ -248,21 +220,21 @@ public java.util.Listrepeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ @java.lang.Override public int getCompoundQueueDataListCount() { return compoundQueueDataList_.size(); } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ @java.lang.Override public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueDataList(int index) { return compoundQueueDataList_.get(index); } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ @java.lang.Override public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataListOrBuilder( @@ -270,6 +242,34 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOr return compoundQueueDataList_.get(index); } + public static final int UNLOCKCOMPOUNDLIST_FIELD_NUMBER = 14; + private com.google.protobuf.Internal.IntList unlockCompoundList_; + /** + * repeated uint32 unlockCompoundList = 14; + * @return A list containing the unlockCompoundList. + */ + @java.lang.Override + public java.util.List + getUnlockCompoundListList() { + return unlockCompoundList_; + } + /** + * repeated uint32 unlockCompoundList = 14; + * @return The count of unlockCompoundList. + */ + public int getUnlockCompoundListCount() { + return unlockCompoundList_.size(); + } + /** + * repeated uint32 unlockCompoundList = 14; + * @param index The index of the element to return. + * @return The unlockCompoundList at the given index. + */ + public int getUnlockCompoundList(int index) { + return unlockCompoundList_.getInt(index); + } + private int unlockCompoundListMemoizedSerializedSize = -1; + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -285,19 +285,19 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); + if (retcode_ != 0) { + output.writeInt32(1, retcode_); + } + for (int i = 0; i < compoundQueueDataList_.size(); i++) { + output.writeMessage(10, compoundQueueDataList_.get(i)); + } if (getUnlockCompoundListList().size() > 0) { - output.writeUInt32NoTag(74); + output.writeUInt32NoTag(114); output.writeUInt32NoTag(unlockCompoundListMemoizedSerializedSize); } for (int i = 0; i < unlockCompoundList_.size(); i++) { output.writeUInt32NoTag(unlockCompoundList_.getInt(i)); } - for (int i = 0; i < compoundQueueDataList_.size(); i++) { - output.writeMessage(12, compoundQueueDataList_.get(i)); - } - if (retcode_ != 0) { - output.writeInt32(14, retcode_); - } unknownFields.writeTo(output); } @@ -307,6 +307,14 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, retcode_); + } + for (int i = 0; i < compoundQueueDataList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(10, compoundQueueDataList_.get(i)); + } { int dataSize = 0; for (int i = 0; i < unlockCompoundList_.size(); i++) { @@ -321,14 +329,6 @@ public int getSerializedSize() { } unlockCompoundListMemoizedSerializedSize = dataSize; } - for (int i = 0; i < compoundQueueDataList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, compoundQueueDataList_.get(i)); - } - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(14, retcode_); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -346,10 +346,10 @@ public boolean equals(final java.lang.Object obj) { if (getRetcode() != other.getRetcode()) return false; - if (!getUnlockCompoundListList() - .equals(other.getUnlockCompoundListList())) return false; if (!getCompoundQueueDataListList() .equals(other.getCompoundQueueDataListList())) return false; + if (!getUnlockCompoundListList() + .equals(other.getUnlockCompoundListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -363,14 +363,14 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - if (getUnlockCompoundListCount() > 0) { - hash = (37 * hash) + UNLOCKCOMPOUNDLIST_FIELD_NUMBER; - hash = (53 * hash) + getUnlockCompoundListList().hashCode(); - } if (getCompoundQueueDataListCount() > 0) { hash = (37 * hash) + COMPOUNDQUEUEDATALIST_FIELD_NUMBER; hash = (53 * hash) + getCompoundQueueDataListList().hashCode(); } + if (getUnlockCompoundListCount() > 0) { + hash = (37 * hash) + UNLOCKCOMPOUNDLIST_FIELD_NUMBER; + hash = (53 * hash) + getUnlockCompoundListList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -468,8 +468,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 24302
-     * Obf: AFFGNHAFPID
+     * CmdId: 4557
+     * obf: NIKJBKDFCDL
      *
* * Protobuf type {@code GetCompoundDataRsp} @@ -512,14 +512,14 @@ public Builder clear() { super.clear(); retcode_ = 0; - unlockCompoundList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); if (compoundQueueDataListBuilder_ == null) { compoundQueueDataList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { compoundQueueDataListBuilder_.clear(); } + unlockCompoundList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -548,20 +548,20 @@ public emu.grasscutter.net.proto.GetCompoundDataRspOuterClass.GetCompoundDataRsp emu.grasscutter.net.proto.GetCompoundDataRspOuterClass.GetCompoundDataRsp result = new emu.grasscutter.net.proto.GetCompoundDataRspOuterClass.GetCompoundDataRsp(this); int from_bitField0_ = bitField0_; result.retcode_ = retcode_; - if (((bitField0_ & 0x00000001) != 0)) { - unlockCompoundList_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.unlockCompoundList_ = unlockCompoundList_; if (compoundQueueDataListBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { compoundQueueDataList_ = java.util.Collections.unmodifiableList(compoundQueueDataList_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } result.compoundQueueDataList_ = compoundQueueDataList_; } else { result.compoundQueueDataList_ = compoundQueueDataListBuilder_.build(); } + if (((bitField0_ & 0x00000002) != 0)) { + unlockCompoundList_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.unlockCompoundList_ = unlockCompoundList_; onBuilt(); return result; } @@ -613,21 +613,11 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetCompoundDataRspOuterClass. if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (!other.unlockCompoundList_.isEmpty()) { - if (unlockCompoundList_.isEmpty()) { - unlockCompoundList_ = other.unlockCompoundList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureUnlockCompoundListIsMutable(); - unlockCompoundList_.addAll(other.unlockCompoundList_); - } - onChanged(); - } if (compoundQueueDataListBuilder_ == null) { if (!other.compoundQueueDataList_.isEmpty()) { if (compoundQueueDataList_.isEmpty()) { compoundQueueDataList_ = other.compoundQueueDataList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureCompoundQueueDataListIsMutable(); compoundQueueDataList_.addAll(other.compoundQueueDataList_); @@ -640,7 +630,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetCompoundDataRspOuterClass. compoundQueueDataListBuilder_.dispose(); compoundQueueDataListBuilder_ = null; compoundQueueDataList_ = other.compoundQueueDataList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); compoundQueueDataListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getCompoundQueueDataListFieldBuilder() : null; @@ -649,6 +639,16 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetCompoundDataRspOuterClass. } } } + if (!other.unlockCompoundList_.isEmpty()) { + if (unlockCompoundList_.isEmpty()) { + unlockCompoundList_ = other.unlockCompoundList_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureUnlockCompoundListIsMutable(); + unlockCompoundList_.addAll(other.unlockCompoundList_); + } + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -681,7 +681,7 @@ public Builder mergeFrom( private int retcode_ ; /** - * int32 retcode = 14; + * int32 retcode = 1; * @return The retcode. */ @java.lang.Override @@ -689,7 +689,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 14; + * int32 retcode = 1; * @param value The retcode to set. * @return This builder for chaining. */ @@ -700,7 +700,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 14; + * int32 retcode = 1; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -710,91 +710,12 @@ public Builder clearRetcode() { return this; } - private com.google.protobuf.Internal.IntList unlockCompoundList_ = emptyIntList(); - private void ensureUnlockCompoundListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - unlockCompoundList_ = mutableCopy(unlockCompoundList_); - bitField0_ |= 0x00000001; - } - } - /** - * repeated uint32 unlockCompoundList = 9; - * @return A list containing the unlockCompoundList. - */ - public java.util.List - getUnlockCompoundListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(unlockCompoundList_) : unlockCompoundList_; - } - /** - * repeated uint32 unlockCompoundList = 9; - * @return The count of unlockCompoundList. - */ - public int getUnlockCompoundListCount() { - return unlockCompoundList_.size(); - } - /** - * repeated uint32 unlockCompoundList = 9; - * @param index The index of the element to return. - * @return The unlockCompoundList at the given index. - */ - public int getUnlockCompoundList(int index) { - return unlockCompoundList_.getInt(index); - } - /** - * repeated uint32 unlockCompoundList = 9; - * @param index The index to set the value at. - * @param value The unlockCompoundList to set. - * @return This builder for chaining. - */ - public Builder setUnlockCompoundList( - int index, int value) { - ensureUnlockCompoundListIsMutable(); - unlockCompoundList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 unlockCompoundList = 9; - * @param value The unlockCompoundList to add. - * @return This builder for chaining. - */ - public Builder addUnlockCompoundList(int value) { - ensureUnlockCompoundListIsMutable(); - unlockCompoundList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 unlockCompoundList = 9; - * @param values The unlockCompoundList to add. - * @return This builder for chaining. - */ - public Builder addAllUnlockCompoundList( - java.lang.Iterable values) { - ensureUnlockCompoundListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, unlockCompoundList_); - onChanged(); - return this; - } - /** - * repeated uint32 unlockCompoundList = 9; - * @return This builder for chaining. - */ - public Builder clearUnlockCompoundList() { - unlockCompoundList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } - private java.util.List compoundQueueDataList_ = java.util.Collections.emptyList(); private void ensureCompoundQueueDataListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { compoundQueueDataList_ = new java.util.ArrayList(compoundQueueDataList_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } @@ -802,7 +723,7 @@ private void ensureCompoundQueueDataListIsMutable() { emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder> compoundQueueDataListBuilder_; /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public java.util.List getCompoundQueueDataListList() { if (compoundQueueDataListBuilder_ == null) { @@ -812,7 +733,7 @@ public java.util.Listrepeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public int getCompoundQueueDataListCount() { if (compoundQueueDataListBuilder_ == null) { @@ -822,7 +743,7 @@ public int getCompoundQueueDataListCount() { } } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueDataList(int index) { if (compoundQueueDataListBuilder_ == null) { @@ -832,7 +753,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData g } } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder setCompoundQueueDataList( int index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) { @@ -849,7 +770,7 @@ public Builder setCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder setCompoundQueueDataList( int index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) { @@ -863,7 +784,7 @@ public Builder setCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder addCompoundQueueDataList(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) { if (compoundQueueDataListBuilder_ == null) { @@ -879,7 +800,7 @@ public Builder addCompoundQueueDataList(emu.grasscutter.net.proto.CompoundQueueD return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder addCompoundQueueDataList( int index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) { @@ -896,7 +817,7 @@ public Builder addCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder addCompoundQueueDataList( emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) { @@ -910,7 +831,7 @@ public Builder addCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder addCompoundQueueDataList( int index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) { @@ -924,7 +845,7 @@ public Builder addCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder addAllCompoundQueueDataList( java.lang.Iterable values) { @@ -939,12 +860,12 @@ public Builder addAllCompoundQueueDataList( return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder clearCompoundQueueDataList() { if (compoundQueueDataListBuilder_ == null) { compoundQueueDataList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { compoundQueueDataListBuilder_.clear(); @@ -952,7 +873,7 @@ public Builder clearCompoundQueueDataList() { return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public Builder removeCompoundQueueDataList(int index) { if (compoundQueueDataListBuilder_ == null) { @@ -965,14 +886,14 @@ public Builder removeCompoundQueueDataList(int index) { return this; } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder getCompoundQueueDataListBuilder( int index) { return getCompoundQueueDataListFieldBuilder().getBuilder(index); } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataListOrBuilder( int index) { @@ -982,7 +903,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOr } } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public java.util.List getCompoundQueueDataListOrBuilderList() { @@ -993,14 +914,14 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOr } } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder addCompoundQueueDataListBuilder() { return getCompoundQueueDataListFieldBuilder().addBuilder( emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance()); } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder addCompoundQueueDataListBuilder( int index) { @@ -1008,7 +929,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.B index, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance()); } /** - * repeated .CompoundQueueData compoundQueueDataList = 12; + * repeated .CompoundQueueData compoundQueueDataList = 10; */ public java.util.List getCompoundQueueDataListBuilderList() { @@ -1021,13 +942,92 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.B compoundQueueDataListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder>( compoundQueueDataList_, - ((bitField0_ & 0x00000002) != 0), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); compoundQueueDataList_ = null; } return compoundQueueDataListBuilder_; } + + private com.google.protobuf.Internal.IntList unlockCompoundList_ = emptyIntList(); + private void ensureUnlockCompoundListIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + unlockCompoundList_ = mutableCopy(unlockCompoundList_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated uint32 unlockCompoundList = 14; + * @return A list containing the unlockCompoundList. + */ + public java.util.List + getUnlockCompoundListList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(unlockCompoundList_) : unlockCompoundList_; + } + /** + * repeated uint32 unlockCompoundList = 14; + * @return The count of unlockCompoundList. + */ + public int getUnlockCompoundListCount() { + return unlockCompoundList_.size(); + } + /** + * repeated uint32 unlockCompoundList = 14; + * @param index The index of the element to return. + * @return The unlockCompoundList at the given index. + */ + public int getUnlockCompoundList(int index) { + return unlockCompoundList_.getInt(index); + } + /** + * repeated uint32 unlockCompoundList = 14; + * @param index The index to set the value at. + * @param value The unlockCompoundList to set. + * @return This builder for chaining. + */ + public Builder setUnlockCompoundList( + int index, int value) { + ensureUnlockCompoundListIsMutable(); + unlockCompoundList_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 unlockCompoundList = 14; + * @param value The unlockCompoundList to add. + * @return This builder for chaining. + */ + public Builder addUnlockCompoundList(int value) { + ensureUnlockCompoundListIsMutable(); + unlockCompoundList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 unlockCompoundList = 14; + * @param values The unlockCompoundList to add. + * @return This builder for chaining. + */ + public Builder addAllUnlockCompoundList( + java.lang.Iterable values) { + ensureUnlockCompoundListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, unlockCompoundList_); + onChanged(); + return this; + } + /** + * repeated uint32 unlockCompoundList = 14; + * @return This builder for chaining. + */ + public Builder clearUnlockCompoundList() { + unlockCompoundList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1097,9 +1097,9 @@ public emu.grasscutter.net.proto.GetCompoundDataRspOuterClass.GetCompoundDataRsp java.lang.String[] descriptorData = { "\n\030GetCompoundDataRsp.proto\032\027CompoundQueu" + "eData.proto\"t\n\022GetCompoundDataRsp\022\017\n\007ret" + - "code\030\016 \001(\005\022\032\n\022unlockCompoundList\030\t \003(\r\0221" + - "\n\025compoundQueueDataList\030\014 \003(\0132\022.Compound" + - "QueueDataB\033\n\031emu.grasscutter.net.protob\006" + + "code\030\001 \001(\005\0221\n\025compoundQueueDataList\030\n \003(" + + "\0132\022.CompoundQueueData\022\032\n\022unlockCompoundL" + + "ist\030\016 \003(\rB\033\n\031emu.grasscutter.net.protob\006" + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1112,7 +1112,7 @@ public emu.grasscutter.net.proto.GetCompoundDataRspOuterClass.GetCompoundDataRsp internal_static_GetCompoundDataRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GetCompoundDataRsp_descriptor, - new java.lang.String[] { "Retcode", "UnlockCompoundList", "CompoundQueueDataList", }); + new java.lang.String[] { "Retcode", "CompoundQueueDataList", "UnlockCompoundList", }); emu.grasscutter.net.proto.CompoundQueueDataOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetDailyDungeonEntryInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetDailyDungeonEntryInfoReqOuterClass.java index c209306f7e8..f773b6e47ce 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetDailyDungeonEntryInfoReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetDailyDungeonEntryInfoReqOuterClass.java @@ -19,15 +19,14 @@ public interface GetDailyDungeonEntryInfoReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 scene_id = 5; + * uint32 scene_id = 12; * @return The sceneId. */ int getSceneId(); } /** * 
-   * CmdId: 6924
-   * Obf: MBPLOJNEPHM
+   * CmdId: 23858
    *
* * Protobuf type {@code GetDailyDungeonEntryInfoReq} @@ -74,7 +73,7 @@ private GetDailyDungeonEntryInfoReq( case 0: done = true; break; - case 40: { + case 96: { sceneId_ = input.readUInt32(); break; @@ -111,10 +110,10 @@ private GetDailyDungeonEntryInfoReq( emu.grasscutter.net.proto.GetDailyDungeonEntryInfoReqOuterClass.GetDailyDungeonEntryInfoReq.class, emu.grasscutter.net.proto.GetDailyDungeonEntryInfoReqOuterClass.GetDailyDungeonEntryInfoReq.Builder.class); } - public static final int SCENE_ID_FIELD_NUMBER = 5; + public static final int SCENE_ID_FIELD_NUMBER = 12; private int sceneId_; /** - * uint32 scene_id = 5; + * uint32 scene_id = 12; * @return The sceneId. */ @java.lang.Override @@ -137,7 +136,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (sceneId_ != 0) { - output.writeUInt32(5, sceneId_); + output.writeUInt32(12, sceneId_); } unknownFields.writeTo(output); } @@ -150,7 +149,7 @@ public int getSerializedSize() { size = 0; if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, sceneId_); + .computeUInt32Size(12, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +278,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 6924
-     * Obf: MBPLOJNEPHM
+     * CmdId: 23858
      *
* * Protobuf type {@code GetDailyDungeonEntryInfoReq} @@ -431,7 +429,7 @@ public Builder mergeFrom( private int sceneId_ ; /** - * uint32 scene_id = 5; + * uint32 scene_id = 12; * @return The sceneId. */ @java.lang.Override @@ -439,7 +437,7 @@ public int getSceneId() { return sceneId_; } /** - * uint32 scene_id = 5; + * uint32 scene_id = 12; * @param value The sceneId to set. * @return This builder for chaining. */ @@ -450,7 +448,7 @@ public Builder setSceneId(int value) { return this; } /** - * uint32 scene_id = 5; + * uint32 scene_id = 12; * @return This builder for chaining. */ public Builder clearSceneId() { @@ -527,7 +525,7 @@ public emu.grasscutter.net.proto.GetDailyDungeonEntryInfoReqOuterClass.GetDailyD static { java.lang.String[] descriptorData = { "\n!GetDailyDungeonEntryInfoReq.proto\"/\n\033G" + - "etDailyDungeonEntryInfoReq\022\020\n\010scene_id\030\005" + + "etDailyDungeonEntryInfoReq\022\020\n\010scene_id\030\014" + " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" + "3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetDungeonEntryExploreConditionReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetDungeonEntryExploreConditionReqOuterClass.java index 6772aad8c25..b36c1eb7aae 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetDungeonEntryExploreConditionReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetDungeonEntryExploreConditionReqOuterClass.java @@ -19,27 +19,26 @@ public interface GetDungeonEntryExploreConditionReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 dungeon_entry_config_id = 14; + * uint32 dungeon_entry_scene_point_id = 4; + * @return The dungeonEntryScenePointId. + */ + int getDungeonEntryScenePointId(); + + /** + * uint32 dungeon_entry_config_id = 13; * @return The dungeonEntryConfigId. */ int getDungeonEntryConfigId(); /** - * uint32 scene_id = 6; + * uint32 scene_id = 15; * @return The sceneId. */ int getSceneId(); - - /** - * uint32 dungeon_entry_scene_point_id = 5; - * @return The dungeonEntryScenePointId. - */ - int getDungeonEntryScenePointId(); } /** * 
-   * CmdId: 28261
-   * Obf: EEGGMAGLFIB
+   * CmdId: 21790
    *
* * Protobuf type {@code GetDungeonEntryExploreConditionReq} @@ -86,19 +85,19 @@ private GetDungeonEntryExploreConditionReq( case 0: done = true; break; - case 40: { + case 32: { dungeonEntryScenePointId_ = input.readUInt32(); break; } - case 48: { + case 104: { - sceneId_ = input.readUInt32(); + dungeonEntryConfigId_ = input.readUInt32(); break; } - case 112: { + case 120: { - dungeonEntryConfigId_ = input.readUInt32(); + sceneId_ = input.readUInt32(); break; } default: { @@ -133,10 +132,21 @@ private GetDungeonEntryExploreConditionReq( emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq.class, emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq.Builder.class); } - public static final int DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER = 14; + public static final int DUNGEON_ENTRY_SCENE_POINT_ID_FIELD_NUMBER = 4; + private int dungeonEntryScenePointId_; + /** + * uint32 dungeon_entry_scene_point_id = 4; + * @return The dungeonEntryScenePointId. + */ + @java.lang.Override + public int getDungeonEntryScenePointId() { + return dungeonEntryScenePointId_; + } + + public static final int DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER = 13; private int dungeonEntryConfigId_; /** - * uint32 dungeon_entry_config_id = 14; + * uint32 dungeon_entry_config_id = 13; * @return The dungeonEntryConfigId. */ @java.lang.Override @@ -144,10 +154,10 @@ public int getDungeonEntryConfigId() { return dungeonEntryConfigId_; } - public static final int SCENE_ID_FIELD_NUMBER = 6; + public static final int SCENE_ID_FIELD_NUMBER = 15; private int sceneId_; /** - * uint32 scene_id = 6; + * uint32 scene_id = 15; * @return The sceneId. */ @java.lang.Override @@ -155,17 +165,6 @@ public int getSceneId() { return sceneId_; } - public static final int DUNGEON_ENTRY_SCENE_POINT_ID_FIELD_NUMBER = 5; - private int dungeonEntryScenePointId_; - /** - * uint32 dungeon_entry_scene_point_id = 5; - * @return The dungeonEntryScenePointId. - */ - @java.lang.Override - public int getDungeonEntryScenePointId() { - return dungeonEntryScenePointId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -181,13 +180,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (dungeonEntryScenePointId_ != 0) { - output.writeUInt32(5, dungeonEntryScenePointId_); - } - if (sceneId_ != 0) { - output.writeUInt32(6, sceneId_); + output.writeUInt32(4, dungeonEntryScenePointId_); } if (dungeonEntryConfigId_ != 0) { - output.writeUInt32(14, dungeonEntryConfigId_); + output.writeUInt32(13, dungeonEntryConfigId_); + } + if (sceneId_ != 0) { + output.writeUInt32(15, sceneId_); } unknownFields.writeTo(output); } @@ -200,15 +199,15 @@ public int getSerializedSize() { size = 0; if (dungeonEntryScenePointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, dungeonEntryScenePointId_); + .computeUInt32Size(4, dungeonEntryScenePointId_); } - if (sceneId_ != 0) { + if (dungeonEntryConfigId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, sceneId_); + .computeUInt32Size(13, dungeonEntryConfigId_); } - if (dungeonEntryConfigId_ != 0) { + if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, dungeonEntryConfigId_); + .computeUInt32Size(15, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +224,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq other = (emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq) obj; + if (getDungeonEntryScenePointId() + != other.getDungeonEntryScenePointId()) return false; if (getDungeonEntryConfigId() != other.getDungeonEntryConfigId()) return false; if (getSceneId() != other.getSceneId()) return false; - if (getDungeonEntryScenePointId() - != other.getDungeonEntryScenePointId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +241,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + DUNGEON_ENTRY_SCENE_POINT_ID_FIELD_NUMBER; + hash = (53 * hash) + getDungeonEntryScenePointId(); hash = (37 * hash) + DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER; hash = (53 * hash) + getDungeonEntryConfigId(); hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); - hash = (37 * hash) + DUNGEON_ENTRY_SCENE_POINT_ID_FIELD_NUMBER; - hash = (53 * hash) + getDungeonEntryScenePointId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +344,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28261
-     * Obf: EEGGMAGLFIB
+     * CmdId: 21790
      *
* * Protobuf type {@code GetDungeonEntryExploreConditionReq} @@ -386,12 +384,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + dungeonEntryScenePointId_ = 0; + dungeonEntryConfigId_ = 0; sceneId_ = 0; - dungeonEntryScenePointId_ = 0; - return this; } @@ -418,9 +416,9 @@ public emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.Ge @java.lang.Override public emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq buildPartial() { emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq result = new emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq(this); + result.dungeonEntryScenePointId_ = dungeonEntryScenePointId_; result.dungeonEntryConfigId_ = dungeonEntryConfigId_; result.sceneId_ = sceneId_; - result.dungeonEntryScenePointId_ = dungeonEntryScenePointId_; onBuilt(); return result; } @@ -469,15 +467,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq other) { if (other == emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.GetDungeonEntryExploreConditionReq.getDefaultInstance()) return this; + if (other.getDungeonEntryScenePointId() != 0) { + setDungeonEntryScenePointId(other.getDungeonEntryScenePointId()); + } if (other.getDungeonEntryConfigId() != 0) { setDungeonEntryConfigId(other.getDungeonEntryConfigId()); } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } - if (other.getDungeonEntryScenePointId() != 0) { - setDungeonEntryScenePointId(other.getDungeonEntryScenePointId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -507,95 +505,95 @@ public Builder mergeFrom( return this; } - private int dungeonEntryConfigId_ ; + private int dungeonEntryScenePointId_ ; /** - * uint32 dungeon_entry_config_id = 14; - * @return The dungeonEntryConfigId. + * uint32 dungeon_entry_scene_point_id = 4; + * @return The dungeonEntryScenePointId. */ @java.lang.Override - public int getDungeonEntryConfigId() { - return dungeonEntryConfigId_; + public int getDungeonEntryScenePointId() { + return dungeonEntryScenePointId_; } /** - * uint32 dungeon_entry_config_id = 14; - * @param value The dungeonEntryConfigId to set. + * uint32 dungeon_entry_scene_point_id = 4; + * @param value The dungeonEntryScenePointId to set. * @return This builder for chaining. */ - public Builder setDungeonEntryConfigId(int value) { + public Builder setDungeonEntryScenePointId(int value) { - dungeonEntryConfigId_ = value; + dungeonEntryScenePointId_ = value; onChanged(); return this; } /** - * uint32 dungeon_entry_config_id = 14; + * uint32 dungeon_entry_scene_point_id = 4; * @return This builder for chaining. */ - public Builder clearDungeonEntryConfigId() { + public Builder clearDungeonEntryScenePointId() { - dungeonEntryConfigId_ = 0; + dungeonEntryScenePointId_ = 0; onChanged(); return this; } - private int sceneId_ ; + private int dungeonEntryConfigId_ ; /** - * uint32 scene_id = 6; - * @return The sceneId. + * uint32 dungeon_entry_config_id = 13; + * @return The dungeonEntryConfigId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getDungeonEntryConfigId() { + return dungeonEntryConfigId_; } /** - * uint32 scene_id = 6; - * @param value The sceneId to set. + * uint32 dungeon_entry_config_id = 13; + * @param value The dungeonEntryConfigId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setDungeonEntryConfigId(int value) { - sceneId_ = value; + dungeonEntryConfigId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 6; + * uint32 dungeon_entry_config_id = 13; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearDungeonEntryConfigId() { - sceneId_ = 0; + dungeonEntryConfigId_ = 0; onChanged(); return this; } - private int dungeonEntryScenePointId_ ; + private int sceneId_ ; /** - * uint32 dungeon_entry_scene_point_id = 5; - * @return The dungeonEntryScenePointId. + * uint32 scene_id = 15; + * @return The sceneId. */ @java.lang.Override - public int getDungeonEntryScenePointId() { - return dungeonEntryScenePointId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 dungeon_entry_scene_point_id = 5; - * @param value The dungeonEntryScenePointId to set. + * uint32 scene_id = 15; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setDungeonEntryScenePointId(int value) { + public Builder setSceneId(int value) { - dungeonEntryScenePointId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 dungeon_entry_scene_point_id = 5; + * uint32 scene_id = 15; * @return This builder for chaining. */ - public Builder clearDungeonEntryScenePointId() { + public Builder clearSceneId() { - dungeonEntryScenePointId_ = 0; + sceneId_ = 0; onChanged(); return this; } @@ -668,9 +666,9 @@ public emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.Ge java.lang.String[] descriptorData = { "\n(GetDungeonEntryExploreConditionReq.pro" + "to\"}\n\"GetDungeonEntryExploreConditionReq" + - "\022\037\n\027dungeon_entry_config_id\030\016 \001(\r\022\020\n\010sce" + - "ne_id\030\006 \001(\r\022$\n\034dungeon_entry_scene_point" + - "_id\030\005 \001(\rB\033\n\031emu.grasscutter.net.protob\006" + + "\022$\n\034dungeon_entry_scene_point_id\030\004 \001(\r\022\037" + + "\n\027dungeon_entry_config_id\030\r \001(\r\022\020\n\010scene" + + "_id\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006" + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -682,7 +680,7 @@ public emu.grasscutter.net.proto.GetDungeonEntryExploreConditionReqOuterClass.Ge internal_static_GetDungeonEntryExploreConditionReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GetDungeonEntryExploreConditionReq_descriptor, - new java.lang.String[] { "DungeonEntryConfigId", "SceneId", "DungeonEntryScenePointId", }); + new java.lang.String[] { "DungeonEntryScenePointId", "DungeonEntryConfigId", "SceneId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataRspOuterClass.java index 259ad2a7f7e..2d61816ee15 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataRspOuterClass.java @@ -42,6 +42,11 @@ public interface GetShopmallDataRspOrBuilder extends int getRetcode(); } /** + * 
+   * CmdId: 25192
+   * obf: AOAKBECNKJL
+   *
+ * * Protobuf type {@code GetShopmallDataRsp} */ public static final class GetShopmallDataRsp extends @@ -372,6 +377,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 25192
+     * obf: AOAKBECNKJL
+     *
+ * * Protobuf type {@code GetShopmallDataRsp} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetWorldMpInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetWorldMpInfoRspOuterClass.java index aebfe13505d..a069b2c7cab 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GetWorldMpInfoRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GetWorldMpInfoRspOuterClass.java @@ -19,27 +19,27 @@ public interface GetWorldMpInfoRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 9; + * int32 retcode = 5; * @return The retcode. */ int getRetcode(); /** - * bool is_in_mp_mode = 4; + * bool is_in_mp_mode = 6; * @return The isInMpMode. */ boolean getIsInMpMode(); /** - * uint32 quit_mp_valid_time = 1; + * uint32 quit_mp_valid_time = 10; * @return The quitMpValidTime. */ int getQuitMpValidTime(); } /** * 
-   * CmdId: 1461
-   * Obf: IBJEKEMGICD
+   * CmdId: 3080
+   * obf: LOBDECIPBLM
    *
* * Protobuf type {@code GetWorldMpInfoRsp} @@ -86,19 +86,19 @@ private GetWorldMpInfoRsp( case 0: done = true; break; - case 8: { + case 40: { - quitMpValidTime_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 32: { + case 48: { isInMpMode_ = input.readBool(); break; } - case 72: { + case 80: { - retcode_ = input.readInt32(); + quitMpValidTime_ = input.readUInt32(); break; } default: { @@ -133,10 +133,10 @@ private GetWorldMpInfoRsp( emu.grasscutter.net.proto.GetWorldMpInfoRspOuterClass.GetWorldMpInfoRsp.class, emu.grasscutter.net.proto.GetWorldMpInfoRspOuterClass.GetWorldMpInfoRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 9; + public static final int RETCODE_FIELD_NUMBER = 5; private int retcode_; /** - * int32 retcode = 9; + * int32 retcode = 5; * @return The retcode. */ @java.lang.Override @@ -144,10 +144,10 @@ public int getRetcode() { return retcode_; } - public static final int IS_IN_MP_MODE_FIELD_NUMBER = 4; + public static final int IS_IN_MP_MODE_FIELD_NUMBER = 6; private boolean isInMpMode_; /** - * bool is_in_mp_mode = 4; + * bool is_in_mp_mode = 6; * @return The isInMpMode. */ @java.lang.Override @@ -155,10 +155,10 @@ public boolean getIsInMpMode() { return isInMpMode_; } - public static final int QUIT_MP_VALID_TIME_FIELD_NUMBER = 1; + public static final int QUIT_MP_VALID_TIME_FIELD_NUMBER = 10; private int quitMpValidTime_; /** - * uint32 quit_mp_valid_time = 1; + * uint32 quit_mp_valid_time = 10; * @return The quitMpValidTime. */ @java.lang.Override @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (quitMpValidTime_ != 0) { - output.writeUInt32(1, quitMpValidTime_); + if (retcode_ != 0) { + output.writeInt32(5, retcode_); } if (isInMpMode_ != false) { - output.writeBool(4, isInMpMode_); + output.writeBool(6, isInMpMode_); } - if (retcode_ != 0) { - output.writeInt32(9, retcode_); + if (quitMpValidTime_ != 0) { + output.writeUInt32(10, quitMpValidTime_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (quitMpValidTime_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, quitMpValidTime_); + .computeInt32Size(5, retcode_); } if (isInMpMode_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, isInMpMode_); + .computeBoolSize(6, isInMpMode_); } - if (retcode_ != 0) { + if (quitMpValidTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, retcode_); + .computeUInt32Size(10, quitMpValidTime_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -346,8 +346,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 1461
-     * Obf: IBJEKEMGICD
+     * CmdId: 3080
+     * obf: LOBDECIPBLM
      *
* * Protobuf type {@code GetWorldMpInfoRsp} @@ -510,7 +510,7 @@ public Builder mergeFrom( private int retcode_ ; /** - * int32 retcode = 9; + * int32 retcode = 5; * @return The retcode. */ @java.lang.Override @@ -518,7 +518,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 9; + * int32 retcode = 5; * @param value The retcode to set. * @return This builder for chaining. */ @@ -529,7 +529,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 9; + * int32 retcode = 5; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -541,7 +541,7 @@ public Builder clearRetcode() { private boolean isInMpMode_ ; /** - * bool is_in_mp_mode = 4; + * bool is_in_mp_mode = 6; * @return The isInMpMode. */ @java.lang.Override @@ -549,7 +549,7 @@ public boolean getIsInMpMode() { return isInMpMode_; } /** - * bool is_in_mp_mode = 4; + * bool is_in_mp_mode = 6; * @param value The isInMpMode to set. * @return This builder for chaining. */ @@ -560,7 +560,7 @@ public Builder setIsInMpMode(boolean value) { return this; } /** - * bool is_in_mp_mode = 4; + * bool is_in_mp_mode = 6; * @return This builder for chaining. */ public Builder clearIsInMpMode() { @@ -572,7 +572,7 @@ public Builder clearIsInMpMode() { private int quitMpValidTime_ ; /** - * uint32 quit_mp_valid_time = 1; + * uint32 quit_mp_valid_time = 10; * @return The quitMpValidTime. */ @java.lang.Override @@ -580,7 +580,7 @@ public int getQuitMpValidTime() { return quitMpValidTime_; } /** - * uint32 quit_mp_valid_time = 1; + * uint32 quit_mp_valid_time = 10; * @param value The quitMpValidTime to set. * @return This builder for chaining. */ @@ -591,7 +591,7 @@ public Builder setQuitMpValidTime(int value) { return this; } /** - * uint32 quit_mp_valid_time = 1; + * uint32 quit_mp_valid_time = 10; * @return This builder for chaining. */ public Builder clearQuitMpValidTime() { @@ -668,8 +668,8 @@ public emu.grasscutter.net.proto.GetWorldMpInfoRspOuterClass.GetWorldMpInfoRsp g static { java.lang.String[] descriptorData = { "\n\027GetWorldMpInfoRsp.proto\"W\n\021GetWorldMpI" + - "nfoRsp\022\017\n\007retcode\030\t \001(\005\022\025\n\ris_in_mp_mode" + - "\030\004 \001(\010\022\032\n\022quit_mp_valid_time\030\001 \001(\rB\033\n\031em" + + "nfoRsp\022\017\n\007retcode\030\005 \001(\005\022\025\n\ris_in_mp_mode" + + "\030\006 \001(\010\022\032\n\022quit_mp_valid_time\030\n \001(\rB\033\n\031em" + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GivingRecordNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GivingRecordNotifyOuterClass.java index fffe2abb18f..409f15519dc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GivingRecordNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GivingRecordNotifyOuterClass.java @@ -44,8 +44,8 @@ emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecordOrBuilder getGiving } /** * 
-   * CmdId: 7258
-   * Obf: DPEHMENOLIB
+   * CmdId: 951
+   * obf: EFOAJNDDCOF
    *
* * Protobuf type {@code GivingRecordNotify} @@ -337,8 +337,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7258
-     * Obf: DPEHMENOLIB
+     * CmdId: 951
+     * obf: EFOAJNDDCOF
      *
* * Protobuf type {@code GivingRecordNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GivingRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GivingRecordOuterClass.java index b06420614d3..342577f54e0 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GivingRecordOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GivingRecordOuterClass.java @@ -19,41 +19,17 @@ public interface GivingRecordOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 config_id = 2; - * @return The configId. - */ - int getConfigId(); - - /** - * bool is_gadget_giving = 15; - * @return The isGadgetGiving. - */ - boolean getIsGadgetGiving(); - - /** - * uint32 last_group_id = 14; - * @return The lastGroupId. - */ - int getLastGroupId(); - - /** - * uint32 giving_id = 3; + * uint32 giving_id = 1; * @return The givingId. */ int getGivingId(); /** - * bool is_finished = 6; - * @return The isFinished. - */ - boolean getIsFinished(); - - /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ int getMaterialCntMapCount(); /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ boolean containsMaterialCntMap( int key); @@ -64,33 +40,57 @@ boolean containsMaterialCntMap( java.util.Map getMaterialCntMap(); /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ java.util.Map getMaterialCntMapMap(); /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ int getMaterialCntMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ int getMaterialCntMapOrThrow( int key); /** - * uint32 group_id = 5; + * uint32 last_group_id = 5; + * @return The lastGroupId. + */ + int getLastGroupId(); + + /** + * bool is_gadget_giving = 11; + * @return The isGadgetGiving. + */ + boolean getIsGadgetGiving(); + + /** + * uint32 group_id = 12; * @return The groupId. */ int getGroupId(); + + /** + * uint32 config_id = 13; + * @return The configId. + */ + int getConfigId(); + + /** + * bool is_finished = 15; + * @return The isFinished. + */ + boolean getIsFinished(); } /** * 
-   * Obf: JNJOKGNEKIK
+   * obf: EDAIFEEBMFK
    *
* * Protobuf type {@code GivingRecord} @@ -138,17 +138,12 @@ private GivingRecord( case 0: done = true; break; - case 16: { - - configId_ = input.readUInt32(); - break; - } - case 24: { + case 8: { givingId_ = input.readUInt32(); break; } - case 34: { + case 26: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { materialCntMap_ = com.google.protobuf.MapField.newMapField( MaterialCntMapDefaultEntryHolder.defaultEntry); @@ -163,22 +158,27 @@ private GivingRecord( } case 40: { - groupId_ = input.readUInt32(); + lastGroupId_ = input.readUInt32(); break; } - case 48: { + case 88: { - isFinished_ = input.readBool(); + isGadgetGiving_ = input.readBool(); break; } - case 112: { + case 96: { - lastGroupId_ = input.readUInt32(); + groupId_ = input.readUInt32(); + break; + } + case 104: { + + configId_ = input.readUInt32(); break; } case 120: { - isGadgetGiving_ = input.readBool(); + isFinished_ = input.readBool(); break; } default: { @@ -210,7 +210,7 @@ private GivingRecord( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 4: + case 3: return internalGetMaterialCntMap(); default: throw new RuntimeException( @@ -225,43 +225,10 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord.class, emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord.Builder.class); } - public static final int CONFIG_ID_FIELD_NUMBER = 2; - private int configId_; - /** - * uint32 config_id = 2; - * @return The configId. - */ - @java.lang.Override - public int getConfigId() { - return configId_; - } - - public static final int IS_GADGET_GIVING_FIELD_NUMBER = 15; - private boolean isGadgetGiving_; - /** - * bool is_gadget_giving = 15; - * @return The isGadgetGiving. - */ - @java.lang.Override - public boolean getIsGadgetGiving() { - return isGadgetGiving_; - } - - public static final int LAST_GROUP_ID_FIELD_NUMBER = 14; - private int lastGroupId_; - /** - * uint32 last_group_id = 14; - * @return The lastGroupId. - */ - @java.lang.Override - public int getLastGroupId() { - return lastGroupId_; - } - - public static final int GIVING_ID_FIELD_NUMBER = 3; + public static final int GIVING_ID_FIELD_NUMBER = 1; private int givingId_; /** - * uint32 giving_id = 3; + * uint32 giving_id = 1; * @return The givingId. */ @java.lang.Override @@ -269,18 +236,7 @@ public int getGivingId() { return givingId_; } - public static final int IS_FINISHED_FIELD_NUMBER = 6; - private boolean isFinished_; - /** - * bool is_finished = 6; - * @return The isFinished. - */ - @java.lang.Override - public boolean getIsFinished() { - return isFinished_; - } - - public static final int MATERIAL_CNT_MAP_FIELD_NUMBER = 4; + public static final int MATERIAL_CNT_MAP_FIELD_NUMBER = 3; private static final class MaterialCntMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -307,7 +263,7 @@ public int getMaterialCntMapCount() { return internalGetMaterialCntMap().getMap().size(); } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ @java.lang.Override @@ -325,7 +281,7 @@ public java.util.Map getMaterialCntMap() { return getMaterialCntMapMap(); } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ @java.lang.Override @@ -333,7 +289,7 @@ public java.util.Map getMaterialCntMapMap( return internalGetMaterialCntMap().getMap(); } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ @java.lang.Override @@ -346,7 +302,7 @@ public int getMaterialCntMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ @java.lang.Override @@ -361,10 +317,32 @@ public int getMaterialCntMapOrThrow( return map.get(key); } - public static final int GROUP_ID_FIELD_NUMBER = 5; + public static final int LAST_GROUP_ID_FIELD_NUMBER = 5; + private int lastGroupId_; + /** + * uint32 last_group_id = 5; + * @return The lastGroupId. + */ + @java.lang.Override + public int getLastGroupId() { + return lastGroupId_; + } + + public static final int IS_GADGET_GIVING_FIELD_NUMBER = 11; + private boolean isGadgetGiving_; + /** + * bool is_gadget_giving = 11; + * @return The isGadgetGiving. + */ + @java.lang.Override + public boolean getIsGadgetGiving() { + return isGadgetGiving_; + } + + public static final int GROUP_ID_FIELD_NUMBER = 12; private int groupId_; /** - * uint32 group_id = 5; + * uint32 group_id = 12; * @return The groupId. */ @java.lang.Override @@ -372,6 +350,28 @@ public int getGroupId() { return groupId_; } + public static final int CONFIG_ID_FIELD_NUMBER = 13; + private int configId_; + /** + * uint32 config_id = 13; + * @return The configId. + */ + @java.lang.Override + public int getConfigId() { + return configId_; + } + + public static final int IS_FINISHED_FIELD_NUMBER = 15; + private boolean isFinished_; + /** + * bool is_finished = 15; + * @return The isFinished. + */ + @java.lang.Override + public boolean getIsFinished() { + return isFinished_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -386,29 +386,29 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (configId_ != 0) { - output.writeUInt32(2, configId_); - } if (givingId_ != 0) { - output.writeUInt32(3, givingId_); + output.writeUInt32(1, givingId_); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetMaterialCntMap(), MaterialCntMapDefaultEntryHolder.defaultEntry, - 4); - if (groupId_ != 0) { - output.writeUInt32(5, groupId_); - } - if (isFinished_ != false) { - output.writeBool(6, isFinished_); - } + 3); if (lastGroupId_ != 0) { - output.writeUInt32(14, lastGroupId_); + output.writeUInt32(5, lastGroupId_); } if (isGadgetGiving_ != false) { - output.writeBool(15, isGadgetGiving_); + output.writeBool(11, isGadgetGiving_); + } + if (groupId_ != 0) { + output.writeUInt32(12, groupId_); + } + if (configId_ != 0) { + output.writeUInt32(13, configId_); + } + if (isFinished_ != false) { + output.writeBool(15, isFinished_); } unknownFields.writeTo(output); } @@ -419,13 +419,9 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (configId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, configId_); - } if (givingId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, givingId_); + .computeUInt32Size(1, givingId_); } for (java.util.Map.Entry entry : internalGetMaterialCntMap().getMap().entrySet()) { @@ -435,23 +431,27 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, materialCntMap__); + .computeMessageSize(3, materialCntMap__); } - if (groupId_ != 0) { + if (lastGroupId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, groupId_); + .computeUInt32Size(5, lastGroupId_); } - if (isFinished_ != false) { + if (isGadgetGiving_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, isFinished_); + .computeBoolSize(11, isGadgetGiving_); } - if (lastGroupId_ != 0) { + if (groupId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, lastGroupId_); + .computeUInt32Size(12, groupId_); } - if (isGadgetGiving_ != false) { + if (configId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(13, configId_); + } + if (isFinished_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(15, isGadgetGiving_); + .computeBoolSize(15, isFinished_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -468,20 +468,20 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord other = (emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord) obj; - if (getConfigId() - != other.getConfigId()) return false; - if (getIsGadgetGiving() - != other.getIsGadgetGiving()) return false; - if (getLastGroupId() - != other.getLastGroupId()) return false; if (getGivingId() != other.getGivingId()) return false; - if (getIsFinished() - != other.getIsFinished()) return false; if (!internalGetMaterialCntMap().equals( other.internalGetMaterialCntMap())) return false; + if (getLastGroupId() + != other.getLastGroupId()) return false; + if (getIsGadgetGiving() + != other.getIsGadgetGiving()) return false; if (getGroupId() != other.getGroupId()) return false; + if (getConfigId() + != other.getConfigId()) return false; + if (getIsFinished() + != other.getIsFinished()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -493,24 +493,24 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER; - hash = (53 * hash) + getConfigId(); - hash = (37 * hash) + IS_GADGET_GIVING_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsGadgetGiving()); - hash = (37 * hash) + LAST_GROUP_ID_FIELD_NUMBER; - hash = (53 * hash) + getLastGroupId(); hash = (37 * hash) + GIVING_ID_FIELD_NUMBER; hash = (53 * hash) + getGivingId(); - hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsFinished()); if (!internalGetMaterialCntMap().getMap().isEmpty()) { hash = (37 * hash) + MATERIAL_CNT_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetMaterialCntMap().hashCode(); } + hash = (37 * hash) + LAST_GROUP_ID_FIELD_NUMBER; + hash = (53 * hash) + getLastGroupId(); + hash = (37 * hash) + IS_GADGET_GIVING_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsGadgetGiving()); hash = (37 * hash) + GROUP_ID_FIELD_NUMBER; hash = (53 * hash) + getGroupId(); + hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER; + hash = (53 * hash) + getConfigId(); + hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsFinished()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -608,7 +608,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: JNJOKGNEKIK
+     * obf: EDAIFEEBMFK
      *
* * Protobuf type {@code GivingRecord} @@ -626,7 +626,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 4: + case 3: return internalGetMaterialCntMap(); default: throw new RuntimeException( @@ -637,7 +637,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 4: + case 3: return internalGetMutableMaterialCntMap(); default: throw new RuntimeException( @@ -670,19 +670,19 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - configId_ = 0; + givingId_ = 0; + + internalGetMutableMaterialCntMap().clear(); + lastGroupId_ = 0; isGadgetGiving_ = false; - lastGroupId_ = 0; + groupId_ = 0; - givingId_ = 0; + configId_ = 0; isFinished_ = false; - internalGetMutableMaterialCntMap().clear(); - groupId_ = 0; - return this; } @@ -710,14 +710,14 @@ public emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord build() { public emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord buildPartial() { emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord result = new emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord(this); int from_bitField0_ = bitField0_; - result.configId_ = configId_; - result.isGadgetGiving_ = isGadgetGiving_; - result.lastGroupId_ = lastGroupId_; result.givingId_ = givingId_; - result.isFinished_ = isFinished_; result.materialCntMap_ = internalGetMaterialCntMap(); result.materialCntMap_.makeImmutable(); + result.lastGroupId_ = lastGroupId_; + result.isGadgetGiving_ = isGadgetGiving_; result.groupId_ = groupId_; + result.configId_ = configId_; + result.isFinished_ = isFinished_; onBuilt(); return result; } @@ -766,26 +766,26 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord other) { if (other == emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord.getDefaultInstance()) return this; - if (other.getConfigId() != 0) { - setConfigId(other.getConfigId()); + if (other.getGivingId() != 0) { + setGivingId(other.getGivingId()); + } + internalGetMutableMaterialCntMap().mergeFrom( + other.internalGetMaterialCntMap()); + if (other.getLastGroupId() != 0) { + setLastGroupId(other.getLastGroupId()); } if (other.getIsGadgetGiving() != false) { setIsGadgetGiving(other.getIsGadgetGiving()); } - if (other.getLastGroupId() != 0) { - setLastGroupId(other.getLastGroupId()); + if (other.getGroupId() != 0) { + setGroupId(other.getGroupId()); } - if (other.getGivingId() != 0) { - setGivingId(other.getGivingId()); + if (other.getConfigId() != 0) { + setConfigId(other.getConfigId()); } if (other.getIsFinished() != false) { setIsFinished(other.getIsFinished()); } - internalGetMutableMaterialCntMap().mergeFrom( - other.internalGetMaterialCntMap()); - if (other.getGroupId() != 0) { - setGroupId(other.getGroupId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -816,102 +816,9 @@ public Builder mergeFrom( } private int bitField0_; - private int configId_ ; - /** - * uint32 config_id = 2; - * @return The configId. - */ - @java.lang.Override - public int getConfigId() { - return configId_; - } - /** - * uint32 config_id = 2; - * @param value The configId to set. - * @return This builder for chaining. - */ - public Builder setConfigId(int value) { - - configId_ = value; - onChanged(); - return this; - } - /** - * uint32 config_id = 2; - * @return This builder for chaining. - */ - public Builder clearConfigId() { - - configId_ = 0; - onChanged(); - return this; - } - - private boolean isGadgetGiving_ ; - /** - * bool is_gadget_giving = 15; - * @return The isGadgetGiving. - */ - @java.lang.Override - public boolean getIsGadgetGiving() { - return isGadgetGiving_; - } - /** - * bool is_gadget_giving = 15; - * @param value The isGadgetGiving to set. - * @return This builder for chaining. - */ - public Builder setIsGadgetGiving(boolean value) { - - isGadgetGiving_ = value; - onChanged(); - return this; - } - /** - * bool is_gadget_giving = 15; - * @return This builder for chaining. - */ - public Builder clearIsGadgetGiving() { - - isGadgetGiving_ = false; - onChanged(); - return this; - } - - private int lastGroupId_ ; - /** - * uint32 last_group_id = 14; - * @return The lastGroupId. - */ - @java.lang.Override - public int getLastGroupId() { - return lastGroupId_; - } - /** - * uint32 last_group_id = 14; - * @param value The lastGroupId to set. - * @return This builder for chaining. - */ - public Builder setLastGroupId(int value) { - - lastGroupId_ = value; - onChanged(); - return this; - } - /** - * uint32 last_group_id = 14; - * @return This builder for chaining. - */ - public Builder clearLastGroupId() { - - lastGroupId_ = 0; - onChanged(); - return this; - } - private int givingId_ ; /** - * uint32 giving_id = 3; + * uint32 giving_id = 1; * @return The givingId. */ @java.lang.Override @@ -919,7 +826,7 @@ public int getGivingId() { return givingId_; } /** - * uint32 giving_id = 3; + * uint32 giving_id = 1; * @param value The givingId to set. * @return This builder for chaining. */ @@ -930,7 +837,7 @@ public Builder setGivingId(int value) { return this; } /** - * uint32 giving_id = 3; + * uint32 giving_id = 1; * @return This builder for chaining. */ public Builder clearGivingId() { @@ -940,37 +847,6 @@ public Builder clearGivingId() { return this; } - private boolean isFinished_ ; - /** - * bool is_finished = 6; - * @return The isFinished. - */ - @java.lang.Override - public boolean getIsFinished() { - return isFinished_; - } - /** - * bool is_finished = 6; - * @param value The isFinished to set. - * @return This builder for chaining. - */ - public Builder setIsFinished(boolean value) { - - isFinished_ = value; - onChanged(); - return this; - } - /** - * bool is_finished = 6; - * @return This builder for chaining. - */ - public Builder clearIsFinished() { - - isFinished_ = false; - onChanged(); - return this; - } - private com.google.protobuf.MapField< java.lang.Integer, java.lang.Integer> materialCntMap_; private com.google.protobuf.MapField @@ -998,7 +874,7 @@ public int getMaterialCntMapCount() { return internalGetMaterialCntMap().getMap().size(); } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ @java.lang.Override @@ -1016,7 +892,7 @@ public java.util.Map getMaterialCntMap() { return getMaterialCntMapMap(); } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ @java.lang.Override @@ -1024,7 +900,7 @@ public java.util.Map getMaterialCntMapMap( return internalGetMaterialCntMap().getMap(); } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ @java.lang.Override @@ -1037,7 +913,7 @@ public int getMaterialCntMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ @java.lang.Override @@ -1058,7 +934,7 @@ public Builder clearMaterialCntMap() { return this; } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ public Builder removeMaterialCntMap( @@ -1077,7 +953,7 @@ public Builder removeMaterialCntMap( return internalGetMutableMaterialCntMap().getMutableMap(); } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ public Builder putMaterialCntMap( int key, @@ -1089,7 +965,7 @@ public Builder putMaterialCntMap( return this; } /** - * map<uint32, uint32> material_cnt_map = 4; + * map<uint32, uint32> material_cnt_map = 3; */ public Builder putAllMaterialCntMap( @@ -1099,9 +975,71 @@ public Builder putAllMaterialCntMap( return this; } + private int lastGroupId_ ; + /** + * uint32 last_group_id = 5; + * @return The lastGroupId. + */ + @java.lang.Override + public int getLastGroupId() { + return lastGroupId_; + } + /** + * uint32 last_group_id = 5; + * @param value The lastGroupId to set. + * @return This builder for chaining. + */ + public Builder setLastGroupId(int value) { + + lastGroupId_ = value; + onChanged(); + return this; + } + /** + * uint32 last_group_id = 5; + * @return This builder for chaining. + */ + public Builder clearLastGroupId() { + + lastGroupId_ = 0; + onChanged(); + return this; + } + + private boolean isGadgetGiving_ ; + /** + * bool is_gadget_giving = 11; + * @return The isGadgetGiving. + */ + @java.lang.Override + public boolean getIsGadgetGiving() { + return isGadgetGiving_; + } + /** + * bool is_gadget_giving = 11; + * @param value The isGadgetGiving to set. + * @return This builder for chaining. + */ + public Builder setIsGadgetGiving(boolean value) { + + isGadgetGiving_ = value; + onChanged(); + return this; + } + /** + * bool is_gadget_giving = 11; + * @return This builder for chaining. + */ + public Builder clearIsGadgetGiving() { + + isGadgetGiving_ = false; + onChanged(); + return this; + } + private int groupId_ ; /** - * uint32 group_id = 5; + * uint32 group_id = 12; * @return The groupId. */ @java.lang.Override @@ -1109,7 +1047,7 @@ public int getGroupId() { return groupId_; } /** - * uint32 group_id = 5; + * uint32 group_id = 12; * @param value The groupId to set. * @return This builder for chaining. */ @@ -1120,7 +1058,7 @@ public Builder setGroupId(int value) { return this; } /** - * uint32 group_id = 5; + * uint32 group_id = 12; * @return This builder for chaining. */ public Builder clearGroupId() { @@ -1129,6 +1067,68 @@ public Builder clearGroupId() { onChanged(); return this; } + + private int configId_ ; + /** + * uint32 config_id = 13; + * @return The configId. + */ + @java.lang.Override + public int getConfigId() { + return configId_; + } + /** + * uint32 config_id = 13; + * @param value The configId to set. + * @return This builder for chaining. + */ + public Builder setConfigId(int value) { + + configId_ = value; + onChanged(); + return this; + } + /** + * uint32 config_id = 13; + * @return This builder for chaining. + */ + public Builder clearConfigId() { + + configId_ = 0; + onChanged(); + return this; + } + + private boolean isFinished_ ; + /** + * bool is_finished = 15; + * @return The isFinished. + */ + @java.lang.Override + public boolean getIsFinished() { + return isFinished_; + } + /** + * bool is_finished = 15; + * @param value The isFinished to set. + * @return This builder for chaining. + */ + public Builder setIsFinished(boolean value) { + + isFinished_ = value; + onChanged(); + return this; + } + /** + * bool is_finished = 15; + * @return This builder for chaining. + */ + public Builder clearIsFinished() { + + isFinished_ = false; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1202,11 +1202,11 @@ public emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord getDefaultI static { java.lang.String[] descriptorData = { "\n\022GivingRecord.proto\"\200\002\n\014GivingRecord\022\021\n" + - "\tconfig_id\030\002 \001(\r\022\030\n\020is_gadget_giving\030\017 \001" + - "(\010\022\025\n\rlast_group_id\030\016 \001(\r\022\021\n\tgiving_id\030\003" + - " \001(\r\022\023\n\013is_finished\030\006 \001(\010\022;\n\020material_cn" + - "t_map\030\004 \003(\0132!.GivingRecord.MaterialCntMa" + - "pEntry\022\020\n\010group_id\030\005 \001(\r\0325\n\023MaterialCntM" + + "\tgiving_id\030\001 \001(\r\022;\n\020material_cnt_map\030\003 \003" + + "(\0132!.GivingRecord.MaterialCntMapEntry\022\025\n" + + "\rlast_group_id\030\005 \001(\r\022\030\n\020is_gadget_giving" + + "\030\013 \001(\010\022\020\n\010group_id\030\014 \001(\r\022\021\n\tconfig_id\030\r " + + "\001(\r\022\023\n\013is_finished\030\017 \001(\010\0325\n\023MaterialCntM" + "apEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B" + "\033\n\031emu.grasscutter.net.protob\006proto3" }; @@ -1219,7 +1219,7 @@ public emu.grasscutter.net.proto.GivingRecordOuterClass.GivingRecord getDefaultI internal_static_GivingRecord_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GivingRecord_descriptor, - new java.lang.String[] { "ConfigId", "IsGadgetGiving", "LastGroupId", "GivingId", "IsFinished", "MaterialCntMap", "GroupId", }); + new java.lang.String[] { "GivingId", "MaterialCntMap", "LastGroupId", "IsGadgetGiving", "GroupId", "ConfigId", "IsFinished", }); internal_static_GivingRecord_MaterialCntMapEntry_descriptor = internal_static_GivingRecord_descriptor.getNestedTypes().get(0); internal_static_GivingRecord_MaterialCntMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GmTalkRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GmTalkRspOuterClass.java index 73635b84d57..fbff3fa6dfb 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/GmTalkRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/GmTalkRspOuterClass.java @@ -19,39 +19,40 @@ public interface GmTalkRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 3; - * @return The retcode. + * string retmsg = 5; + * @return The retmsg. */ - int getRetcode(); + java.lang.String getRetmsg(); + /** + * string retmsg = 5; + * @return The bytes for retmsg. + */ + com.google.protobuf.ByteString + getRetmsgBytes(); /** - * string msg = 7; + * string msg = 12; * @return The msg. */ java.lang.String getMsg(); /** - * string msg = 7; + * string msg = 12; * @return The bytes for msg. */ com.google.protobuf.ByteString getMsgBytes(); /** - * string retmsg = 5; - * @return The retmsg. - */ - java.lang.String getRetmsg(); - /** - * string retmsg = 5; - * @return The bytes for retmsg. + * int32 retcode = 14; + * @return The retcode. */ - com.google.protobuf.ByteString - getRetmsgBytes(); + int getRetcode(); } /** * 
-   * CmdId: 3923
-   * Obf: AEABDALLNNB
+   * 先标记这里 因为还没编译
+   * CmdId: 27437
+   * obf: PDMNOENHHOI
    *
* * Protobuf type {@code GmTalkRsp} @@ -66,8 +67,8 @@ private GmTalkRsp(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private GmTalkRsp() { - msg_ = ""; retmsg_ = ""; + msg_ = ""; } @java.lang.Override @@ -100,23 +101,23 @@ private GmTalkRsp( case 0: done = true; break; - case 24: { - - retcode_ = input.readInt32(); - break; - } case 42: { java.lang.String s = input.readStringRequireUtf8(); retmsg_ = s; break; } - case 58: { + case 98: { java.lang.String s = input.readStringRequireUtf8(); msg_ = s; break; } + case 112: { + + retcode_ = input.readInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -149,93 +150,93 @@ private GmTalkRsp( emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp.class, emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 3; - private int retcode_; - /** - * int32 retcode = 3; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int MSG_FIELD_NUMBER = 7; - private volatile java.lang.Object msg_; + public static final int RETMSG_FIELD_NUMBER = 5; + private volatile java.lang.Object retmsg_; /** - * string msg = 7; - * @return The msg. + * string retmsg = 5; + * @return The retmsg. */ @java.lang.Override - public java.lang.String getMsg() { - java.lang.Object ref = msg_; + public java.lang.String getRetmsg() { + java.lang.Object ref = retmsg_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - msg_ = s; + retmsg_ = s; return s; } } /** - * string msg = 7; - * @return The bytes for msg. + * string retmsg = 5; + * @return The bytes for retmsg. */ @java.lang.Override public com.google.protobuf.ByteString - getMsgBytes() { - java.lang.Object ref = msg_; + getRetmsgBytes() { + java.lang.Object ref = retmsg_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - msg_ = b; + retmsg_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int RETMSG_FIELD_NUMBER = 5; - private volatile java.lang.Object retmsg_; + public static final int MSG_FIELD_NUMBER = 12; + private volatile java.lang.Object msg_; /** - * string retmsg = 5; - * @return The retmsg. + * string msg = 12; + * @return The msg. */ @java.lang.Override - public java.lang.String getRetmsg() { - java.lang.Object ref = retmsg_; + public java.lang.String getMsg() { + java.lang.Object ref = msg_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - retmsg_ = s; + msg_ = s; return s; } } /** - * string retmsg = 5; - * @return The bytes for retmsg. + * string msg = 12; + * @return The bytes for msg. */ @java.lang.Override public com.google.protobuf.ByteString - getRetmsgBytes() { - java.lang.Object ref = retmsg_; + getMsgBytes() { + java.lang.Object ref = msg_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - retmsg_ = b; + msg_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } + public static final int RETCODE_FIELD_NUMBER = 14; + private int retcode_; + /** + * int32 retcode = 14; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -250,14 +251,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (retcode_ != 0) { - output.writeInt32(3, retcode_); - } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(retmsg_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, retmsg_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, msg_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 12, msg_); + } + if (retcode_ != 0) { + output.writeInt32(14, retcode_); } unknownFields.writeTo(output); } @@ -268,15 +269,15 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, retcode_); - } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(retmsg_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, retmsg_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, msg_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, msg_); + } + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(14, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -293,12 +294,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp other = (emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; - if (!getMsg() - .equals(other.getMsg())) return false; if (!getRetmsg() .equals(other.getRetmsg())) return false; + if (!getMsg() + .equals(other.getMsg())) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -310,12 +311,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + MSG_FIELD_NUMBER; - hash = (53 * hash) + getMsg().hashCode(); hash = (37 * hash) + RETMSG_FIELD_NUMBER; hash = (53 * hash) + getRetmsg().hashCode(); + hash = (37 * hash) + MSG_FIELD_NUMBER; + hash = (53 * hash) + getMsg().hashCode(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -413,8 +414,9 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 3923
-     * Obf: AEABDALLNNB
+     * 先标记这里 因为还没编译
+     * CmdId: 27437
+     * obf: PDMNOENHHOI
      *
* * Protobuf type {@code GmTalkRsp} @@ -454,11 +456,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; + retmsg_ = ""; msg_ = ""; - retmsg_ = ""; + retcode_ = 0; return this; } @@ -486,9 +488,9 @@ public emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp build() { @java.lang.Override public emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp buildPartial() { emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp result = new emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp(this); - result.retcode_ = retcode_; - result.msg_ = msg_; result.retmsg_ = retmsg_; + result.msg_ = msg_; + result.retcode_ = retcode_; onBuilt(); return result; } @@ -537,16 +539,16 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp other) { if (other == emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp.getDefaultInstance()) return this; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); + if (!other.getRetmsg().isEmpty()) { + retmsg_ = other.retmsg_; + onChanged(); } if (!other.getMsg().isEmpty()) { msg_ = other.msg_; onChanged(); } - if (!other.getRetmsg().isEmpty()) { - retmsg_ = other.retmsg_; - onChanged(); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -577,185 +579,185 @@ public Builder mergeFrom( return this; } - private int retcode_ ; - /** - * int32 retcode = 3; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 3; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 3; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - - private java.lang.Object msg_ = ""; + private java.lang.Object retmsg_ = ""; /** - * string msg = 7; - * @return The msg. + * string retmsg = 5; + * @return The retmsg. */ - public java.lang.String getMsg() { - java.lang.Object ref = msg_; + public java.lang.String getRetmsg() { + java.lang.Object ref = retmsg_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - msg_ = s; + retmsg_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string msg = 7; - * @return The bytes for msg. + * string retmsg = 5; + * @return The bytes for retmsg. */ public com.google.protobuf.ByteString - getMsgBytes() { - java.lang.Object ref = msg_; + getRetmsgBytes() { + java.lang.Object ref = retmsg_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - msg_ = b; + retmsg_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string msg = 7; - * @param value The msg to set. + * string retmsg = 5; + * @param value The retmsg to set. * @return This builder for chaining. */ - public Builder setMsg( + public Builder setRetmsg( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - msg_ = value; + retmsg_ = value; onChanged(); return this; } /** - * string msg = 7; + * string retmsg = 5; * @return This builder for chaining. */ - public Builder clearMsg() { + public Builder clearRetmsg() { - msg_ = getDefaultInstance().getMsg(); + retmsg_ = getDefaultInstance().getRetmsg(); onChanged(); return this; } /** - * string msg = 7; - * @param value The bytes for msg to set. + * string retmsg = 5; + * @param value The bytes for retmsg to set. * @return This builder for chaining. */ - public Builder setMsgBytes( + public Builder setRetmsgBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - msg_ = value; + retmsg_ = value; onChanged(); return this; } - private java.lang.Object retmsg_ = ""; + private java.lang.Object msg_ = ""; /** - * string retmsg = 5; - * @return The retmsg. + * string msg = 12; + * @return The msg. */ - public java.lang.String getRetmsg() { - java.lang.Object ref = retmsg_; + public java.lang.String getMsg() { + java.lang.Object ref = msg_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - retmsg_ = s; + msg_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string retmsg = 5; - * @return The bytes for retmsg. + * string msg = 12; + * @return The bytes for msg. */ public com.google.protobuf.ByteString - getRetmsgBytes() { - java.lang.Object ref = retmsg_; + getMsgBytes() { + java.lang.Object ref = msg_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - retmsg_ = b; + msg_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string retmsg = 5; - * @param value The retmsg to set. + * string msg = 12; + * @param value The msg to set. * @return This builder for chaining. */ - public Builder setRetmsg( + public Builder setMsg( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - retmsg_ = value; + msg_ = value; onChanged(); return this; } /** - * string retmsg = 5; + * string msg = 12; * @return This builder for chaining. */ - public Builder clearRetmsg() { + public Builder clearMsg() { - retmsg_ = getDefaultInstance().getRetmsg(); + msg_ = getDefaultInstance().getMsg(); onChanged(); return this; } /** - * string retmsg = 5; - * @param value The bytes for retmsg to set. + * string msg = 12; + * @param value The bytes for msg to set. * @return This builder for chaining. */ - public Builder setRetmsgBytes( + public Builder setMsgBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - retmsg_ = value; + msg_ = value; + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 14; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 14; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 14; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; onChanged(); return this; } @@ -826,8 +828,8 @@ public emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp getDefaultInstanc descriptor; static { java.lang.String[] descriptorData = { - "\n\017GmTalkRsp.proto\"9\n\tGmTalkRsp\022\017\n\007retcod" + - "e\030\003 \001(\005\022\013\n\003msg\030\007 \001(\t\022\016\n\006retmsg\030\005 \001(\tB\033\n\031" + + "\n\017GmTalkRsp.proto\"9\n\tGmTalkRsp\022\016\n\006retmsg" + + "\030\005 \001(\t\022\013\n\003msg\030\014 \001(\t\022\017\n\007retcode\030\016 \001(\005B\033\n\031" + "emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -839,7 +841,7 @@ public emu.grasscutter.net.proto.GmTalkRspOuterClass.GmTalkRsp getDefaultInstanc internal_static_GmTalkRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_GmTalkRsp_descriptor, - new java.lang.String[] { "Retcode", "Msg", "Retmsg", }); + new java.lang.String[] { "Retmsg", "Msg", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HitClientTrivialNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HitClientTrivialNotifyOuterClass.java index f09cee3fb57..c750a8877dc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/HitClientTrivialNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/HitClientTrivialNotifyOuterClass.java @@ -42,6 +42,7 @@ public interface HitClientTrivialNotifyOrBuilder extends /** * 
    * CmdId: 25759
+   * obf: PPGAJFBJNNN
    *
* * Protobuf type {@code HitClientTrivialNotify} @@ -349,6 +350,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 25759
+     * obf: PPGAJFBJNNN
      *
* * Protobuf type {@code HitClientTrivialNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/InstableSprayDungeonSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InstableSprayDungeonSettleInfoOuterClass.java index d3d93c7eaac..0837808f63e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/InstableSprayDungeonSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/InstableSprayDungeonSettleInfoOuterClass.java @@ -19,57 +19,53 @@ public interface InstableSprayDungeonSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_new_record = 15; - * @return The isNewRecord. + * uint32 MEMPKCGNNMF = 4; + * @return The mEMPKCGNNMF. */ - boolean getIsNewRecord(); + int getMEMPKCGNNMF(); /** - * uint32 difficulty = 8; - * @return The difficulty. + * uint32 DMNLDPPGOKG = 5; + * @return The dMNLDPPGOKG. */ - int getDifficulty(); + int getDMNLDPPGOKG(); /** - * uint32 stage_id = 5; - * @return The stageId. + * bool is_new_record = 7; + * @return The isNewRecord. */ - int getStageId(); + boolean getIsNewRecord(); /** - * uint32 round = 13; - * @return The round. + * repeated uint32 KNBIFCCIBLE = 11; + * @return A list containing the kNBIFCCIBLE. */ - int getRound(); - + java.util.List getKNBIFCCIBLEList(); /** - * uint32 level_id = 4; - * @return The levelId. + * repeated uint32 KNBIFCCIBLE = 11; + * @return The count of kNBIFCCIBLE. */ - int getLevelId(); - + int getKNBIFCCIBLECount(); /** - * repeated uint32 score_list = 7; - * @return A list containing the scoreList. + * repeated uint32 KNBIFCCIBLE = 11; + * @param index The index of the element to return. + * @return The kNBIFCCIBLE at the given index. */ - java.util.List getScoreListList(); + int getKNBIFCCIBLE(int index); + /** - * repeated uint32 score_list = 7; - * @return The count of scoreList. + * uint32 PJJAOILBFBN = 12; + * @return The pJJAOILBFBN. */ - int getScoreListCount(); + int getPJJAOILBFBN(); + /** - * repeated uint32 score_list = 7; - * @param index The index of the element to return. - * @return The scoreList at the given index. + * uint32 PBKEAOCBPMN = 13; + * @return The pBKEAOCBPMN. */ - int getScoreList(int index); + int getPBKEAOCBPMN(); } /** - * 
-   * Obf: GALINJEGEGO
-   *
- * * Protobuf type {@code InstableSprayDungeonSettleInfo} */ public static final class InstableSprayDungeonSettleInfo extends @@ -82,7 +78,7 @@ private InstableSprayDungeonSettleInfo(com.google.protobuf.GeneratedMessageV3.Bu super(builder); } private InstableSprayDungeonSettleInfo() { - scoreList_ = emptyIntList(); + kNBIFCCIBLE_ = emptyIntList(); } @java.lang.Override @@ -118,48 +114,48 @@ private InstableSprayDungeonSettleInfo( break; case 32: { - levelId_ = input.readUInt32(); + mEMPKCGNNMF_ = input.readUInt32(); break; } case 40: { - stageId_ = input.readUInt32(); + dMNLDPPGOKG_ = input.readUInt32(); break; } case 56: { + + isNewRecord_ = input.readBool(); + break; + } + case 88: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - scoreList_ = newIntList(); + kNBIFCCIBLE_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - scoreList_.addInt(input.readUInt32()); + kNBIFCCIBLE_.addInt(input.readUInt32()); break; } - case 58: { + case 90: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - scoreList_ = newIntList(); + kNBIFCCIBLE_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - scoreList_.addInt(input.readUInt32()); + kNBIFCCIBLE_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 64: { + case 96: { - difficulty_ = input.readUInt32(); + pJJAOILBFBN_ = input.readUInt32(); break; } case 104: { - round_ = input.readUInt32(); - break; - } - case 120: { - - isNewRecord_ = input.readBool(); + pBKEAOCBPMN_ = input.readUInt32(); break; } default: { @@ -178,7 +174,7 @@ private InstableSprayDungeonSettleInfo( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - scoreList_.makeImmutable(); // C + kNBIFCCIBLE_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -197,88 +193,88 @@ private InstableSprayDungeonSettleInfo( emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.class, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder.class); } - public static final int IS_NEW_RECORD_FIELD_NUMBER = 15; - private boolean isNewRecord_; + public static final int MEMPKCGNNMF_FIELD_NUMBER = 4; + private int mEMPKCGNNMF_; /** - * bool is_new_record = 15; - * @return The isNewRecord. + * uint32 MEMPKCGNNMF = 4; + * @return The mEMPKCGNNMF. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getMEMPKCGNNMF() { + return mEMPKCGNNMF_; } - public static final int DIFFICULTY_FIELD_NUMBER = 8; - private int difficulty_; + public static final int DMNLDPPGOKG_FIELD_NUMBER = 5; + private int dMNLDPPGOKG_; /** - * uint32 difficulty = 8; - * @return The difficulty. + * uint32 DMNLDPPGOKG = 5; + * @return The dMNLDPPGOKG. */ @java.lang.Override - public int getDifficulty() { - return difficulty_; + public int getDMNLDPPGOKG() { + return dMNLDPPGOKG_; } - public static final int STAGE_ID_FIELD_NUMBER = 5; - private int stageId_; + public static final int IS_NEW_RECORD_FIELD_NUMBER = 7; + private boolean isNewRecord_; /** - * uint32 stage_id = 5; - * @return The stageId. + * bool is_new_record = 7; + * @return The isNewRecord. */ @java.lang.Override - public int getStageId() { - return stageId_; + public boolean getIsNewRecord() { + return isNewRecord_; } - public static final int ROUND_FIELD_NUMBER = 13; - private int round_; + public static final int KNBIFCCIBLE_FIELD_NUMBER = 11; + private com.google.protobuf.Internal.IntList kNBIFCCIBLE_; /** - * uint32 round = 13; - * @return The round. + * repeated uint32 KNBIFCCIBLE = 11; + * @return A list containing the kNBIFCCIBLE. */ @java.lang.Override - public int getRound() { - return round_; + public java.util.List + getKNBIFCCIBLEList() { + return kNBIFCCIBLE_; } - - public static final int LEVEL_ID_FIELD_NUMBER = 4; - private int levelId_; /** - * uint32 level_id = 4; - * @return The levelId. + * repeated uint32 KNBIFCCIBLE = 11; + * @return The count of kNBIFCCIBLE. */ - @java.lang.Override - public int getLevelId() { - return levelId_; + public int getKNBIFCCIBLECount() { + return kNBIFCCIBLE_.size(); } - - public static final int SCORE_LIST_FIELD_NUMBER = 7; - private com.google.protobuf.Internal.IntList scoreList_; /** - * repeated uint32 score_list = 7; - * @return A list containing the scoreList. + * repeated uint32 KNBIFCCIBLE = 11; + * @param index The index of the element to return. + * @return The kNBIFCCIBLE at the given index. */ - @java.lang.Override - public java.util.List - getScoreListList() { - return scoreList_; + public int getKNBIFCCIBLE(int index) { + return kNBIFCCIBLE_.getInt(index); } + private int kNBIFCCIBLEMemoizedSerializedSize = -1; + + public static final int PJJAOILBFBN_FIELD_NUMBER = 12; + private int pJJAOILBFBN_; /** - * repeated uint32 score_list = 7; - * @return The count of scoreList. + * uint32 PJJAOILBFBN = 12; + * @return The pJJAOILBFBN. */ - public int getScoreListCount() { - return scoreList_.size(); + @java.lang.Override + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } + + public static final int PBKEAOCBPMN_FIELD_NUMBER = 13; + private int pBKEAOCBPMN_; /** - * repeated uint32 score_list = 7; - * @param index The index of the element to return. - * @return The scoreList at the given index. + * uint32 PBKEAOCBPMN = 13; + * @return The pBKEAOCBPMN. */ - public int getScoreList(int index) { - return scoreList_.getInt(index); + @java.lang.Override + public int getPBKEAOCBPMN() { + return pBKEAOCBPMN_; } - private int scoreListMemoizedSerializedSize = -1; private byte memoizedIsInitialized = -1; @java.lang.Override @@ -295,27 +291,27 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (levelId_ != 0) { - output.writeUInt32(4, levelId_); + if (mEMPKCGNNMF_ != 0) { + output.writeUInt32(4, mEMPKCGNNMF_); } - if (stageId_ != 0) { - output.writeUInt32(5, stageId_); + if (dMNLDPPGOKG_ != 0) { + output.writeUInt32(5, dMNLDPPGOKG_); } - if (getScoreListList().size() > 0) { - output.writeUInt32NoTag(58); - output.writeUInt32NoTag(scoreListMemoizedSerializedSize); + if (isNewRecord_ != false) { + output.writeBool(7, isNewRecord_); } - for (int i = 0; i < scoreList_.size(); i++) { - output.writeUInt32NoTag(scoreList_.getInt(i)); + if (getKNBIFCCIBLEList().size() > 0) { + output.writeUInt32NoTag(90); + output.writeUInt32NoTag(kNBIFCCIBLEMemoizedSerializedSize); } - if (difficulty_ != 0) { - output.writeUInt32(8, difficulty_); + for (int i = 0; i < kNBIFCCIBLE_.size(); i++) { + output.writeUInt32NoTag(kNBIFCCIBLE_.getInt(i)); } - if (round_ != 0) { - output.writeUInt32(13, round_); + if (pJJAOILBFBN_ != 0) { + output.writeUInt32(12, pJJAOILBFBN_); } - if (isNewRecord_ != false) { - output.writeBool(15, isNewRecord_); + if (pBKEAOCBPMN_ != 0) { + output.writeUInt32(13, pBKEAOCBPMN_); } unknownFields.writeTo(output); } @@ -326,39 +322,39 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (levelId_ != 0) { + if (mEMPKCGNNMF_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(4, mEMPKCGNNMF_); + } + if (dMNLDPPGOKG_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, levelId_); + .computeUInt32Size(5, dMNLDPPGOKG_); } - if (stageId_ != 0) { + if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, stageId_); + .computeBoolSize(7, isNewRecord_); } { int dataSize = 0; - for (int i = 0; i < scoreList_.size(); i++) { + for (int i = 0; i < kNBIFCCIBLE_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(scoreList_.getInt(i)); + .computeUInt32SizeNoTag(kNBIFCCIBLE_.getInt(i)); } size += dataSize; - if (!getScoreListList().isEmpty()) { + if (!getKNBIFCCIBLEList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - scoreListMemoizedSerializedSize = dataSize; + kNBIFCCIBLEMemoizedSerializedSize = dataSize; } - if (difficulty_ != 0) { + if (pJJAOILBFBN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, difficulty_); + .computeUInt32Size(12, pJJAOILBFBN_); } - if (round_ != 0) { + if (pBKEAOCBPMN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, round_); - } - if (isNewRecord_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(15, isNewRecord_); + .computeUInt32Size(13, pBKEAOCBPMN_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -375,18 +371,18 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo other = (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) obj; + if (getMEMPKCGNNMF() + != other.getMEMPKCGNNMF()) return false; + if (getDMNLDPPGOKG() + != other.getDMNLDPPGOKG()) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; - if (getDifficulty() - != other.getDifficulty()) return false; - if (getStageId() - != other.getStageId()) return false; - if (getRound() - != other.getRound()) return false; - if (getLevelId() - != other.getLevelId()) return false; - if (!getScoreListList() - .equals(other.getScoreListList())) return false; + if (!getKNBIFCCIBLEList() + .equals(other.getKNBIFCCIBLEList())) return false; + if (getPJJAOILBFBN() + != other.getPJJAOILBFBN()) return false; + if (getPBKEAOCBPMN() + != other.getPBKEAOCBPMN()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -398,21 +394,21 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MEMPKCGNNMF_FIELD_NUMBER; + hash = (53 * hash) + getMEMPKCGNNMF(); + hash = (37 * hash) + DMNLDPPGOKG_FIELD_NUMBER; + hash = (53 * hash) + getDMNLDPPGOKG(); hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); - hash = (37 * hash) + DIFFICULTY_FIELD_NUMBER; - hash = (53 * hash) + getDifficulty(); - hash = (37 * hash) + STAGE_ID_FIELD_NUMBER; - hash = (53 * hash) + getStageId(); - hash = (37 * hash) + ROUND_FIELD_NUMBER; - hash = (53 * hash) + getRound(); - hash = (37 * hash) + LEVEL_ID_FIELD_NUMBER; - hash = (53 * hash) + getLevelId(); - if (getScoreListCount() > 0) { - hash = (37 * hash) + SCORE_LIST_FIELD_NUMBER; - hash = (53 * hash) + getScoreListList().hashCode(); - } + if (getKNBIFCCIBLECount() > 0) { + hash = (37 * hash) + KNBIFCCIBLE_FIELD_NUMBER; + hash = (53 * hash) + getKNBIFCCIBLEList().hashCode(); + } + hash = (37 * hash) + PJJAOILBFBN_FIELD_NUMBER; + hash = (53 * hash) + getPJJAOILBFBN(); + hash = (37 * hash) + PBKEAOCBPMN_FIELD_NUMBER; + hash = (53 * hash) + getPBKEAOCBPMN(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -509,10 +505,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: GALINJEGEGO
-     *
- * * Protobuf type {@code InstableSprayDungeonSettleInfo} */ public static final class Builder extends @@ -550,18 +542,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isNewRecord_ = false; + mEMPKCGNNMF_ = 0; - difficulty_ = 0; + dMNLDPPGOKG_ = 0; - stageId_ = 0; + isNewRecord_ = false; - round_ = 0; + kNBIFCCIBLE_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + pJJAOILBFBN_ = 0; - levelId_ = 0; + pBKEAOCBPMN_ = 0; - scoreList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -589,16 +581,16 @@ public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.Instab public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo buildPartial() { emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo result = new emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo(this); int from_bitField0_ = bitField0_; + result.mEMPKCGNNMF_ = mEMPKCGNNMF_; + result.dMNLDPPGOKG_ = dMNLDPPGOKG_; result.isNewRecord_ = isNewRecord_; - result.difficulty_ = difficulty_; - result.stageId_ = stageId_; - result.round_ = round_; - result.levelId_ = levelId_; if (((bitField0_ & 0x00000001) != 0)) { - scoreList_.makeImmutable(); + kNBIFCCIBLE_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.scoreList_ = scoreList_; + result.kNBIFCCIBLE_ = kNBIFCCIBLE_; + result.pJJAOILBFBN_ = pJJAOILBFBN_; + result.pBKEAOCBPMN_ = pBKEAOCBPMN_; onBuilt(); return result; } @@ -647,31 +639,31 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo other) { if (other == emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance()) return this; - if (other.getIsNewRecord() != false) { - setIsNewRecord(other.getIsNewRecord()); - } - if (other.getDifficulty() != 0) { - setDifficulty(other.getDifficulty()); - } - if (other.getStageId() != 0) { - setStageId(other.getStageId()); + if (other.getMEMPKCGNNMF() != 0) { + setMEMPKCGNNMF(other.getMEMPKCGNNMF()); } - if (other.getRound() != 0) { - setRound(other.getRound()); + if (other.getDMNLDPPGOKG() != 0) { + setDMNLDPPGOKG(other.getDMNLDPPGOKG()); } - if (other.getLevelId() != 0) { - setLevelId(other.getLevelId()); + if (other.getIsNewRecord() != false) { + setIsNewRecord(other.getIsNewRecord()); } - if (!other.scoreList_.isEmpty()) { - if (scoreList_.isEmpty()) { - scoreList_ = other.scoreList_; + if (!other.kNBIFCCIBLE_.isEmpty()) { + if (kNBIFCCIBLE_.isEmpty()) { + kNBIFCCIBLE_ = other.kNBIFCCIBLE_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureScoreListIsMutable(); - scoreList_.addAll(other.scoreList_); + ensureKNBIFCCIBLEIsMutable(); + kNBIFCCIBLE_.addAll(other.kNBIFCCIBLE_); } onChanged(); } + if (other.getPJJAOILBFBN() != 0) { + setPJJAOILBFBN(other.getPJJAOILBFBN()); + } + if (other.getPBKEAOCBPMN() != 0) { + setPBKEAOCBPMN(other.getPBKEAOCBPMN()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -702,236 +694,236 @@ public Builder mergeFrom( } private int bitField0_; - private boolean isNewRecord_ ; + private int mEMPKCGNNMF_ ; /** - * bool is_new_record = 15; - * @return The isNewRecord. + * uint32 MEMPKCGNNMF = 4; + * @return The mEMPKCGNNMF. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getMEMPKCGNNMF() { + return mEMPKCGNNMF_; } /** - * bool is_new_record = 15; - * @param value The isNewRecord to set. + * uint32 MEMPKCGNNMF = 4; + * @param value The mEMPKCGNNMF to set. * @return This builder for chaining. */ - public Builder setIsNewRecord(boolean value) { + public Builder setMEMPKCGNNMF(int value) { - isNewRecord_ = value; + mEMPKCGNNMF_ = value; onChanged(); return this; } /** - * bool is_new_record = 15; + * uint32 MEMPKCGNNMF = 4; * @return This builder for chaining. */ - public Builder clearIsNewRecord() { + public Builder clearMEMPKCGNNMF() { - isNewRecord_ = false; + mEMPKCGNNMF_ = 0; onChanged(); return this; } - private int difficulty_ ; + private int dMNLDPPGOKG_ ; /** - * uint32 difficulty = 8; - * @return The difficulty. + * uint32 DMNLDPPGOKG = 5; + * @return The dMNLDPPGOKG. */ @java.lang.Override - public int getDifficulty() { - return difficulty_; + public int getDMNLDPPGOKG() { + return dMNLDPPGOKG_; } /** - * uint32 difficulty = 8; - * @param value The difficulty to set. + * uint32 DMNLDPPGOKG = 5; + * @param value The dMNLDPPGOKG to set. * @return This builder for chaining. */ - public Builder setDifficulty(int value) { + public Builder setDMNLDPPGOKG(int value) { - difficulty_ = value; + dMNLDPPGOKG_ = value; onChanged(); return this; } /** - * uint32 difficulty = 8; + * uint32 DMNLDPPGOKG = 5; * @return This builder for chaining. */ - public Builder clearDifficulty() { + public Builder clearDMNLDPPGOKG() { - difficulty_ = 0; + dMNLDPPGOKG_ = 0; onChanged(); return this; } - private int stageId_ ; + private boolean isNewRecord_ ; /** - * uint32 stage_id = 5; - * @return The stageId. + * bool is_new_record = 7; + * @return The isNewRecord. */ @java.lang.Override - public int getStageId() { - return stageId_; + public boolean getIsNewRecord() { + return isNewRecord_; } /** - * uint32 stage_id = 5; - * @param value The stageId to set. + * bool is_new_record = 7; + * @param value The isNewRecord to set. * @return This builder for chaining. */ - public Builder setStageId(int value) { + public Builder setIsNewRecord(boolean value) { - stageId_ = value; + isNewRecord_ = value; onChanged(); return this; } /** - * uint32 stage_id = 5; + * bool is_new_record = 7; * @return This builder for chaining. */ - public Builder clearStageId() { + public Builder clearIsNewRecord() { - stageId_ = 0; + isNewRecord_ = false; onChanged(); return this; } - private int round_ ; - /** - * uint32 round = 13; - * @return The round. - */ - @java.lang.Override - public int getRound() { - return round_; + private com.google.protobuf.Internal.IntList kNBIFCCIBLE_ = emptyIntList(); + private void ensureKNBIFCCIBLEIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kNBIFCCIBLE_ = mutableCopy(kNBIFCCIBLE_); + bitField0_ |= 0x00000001; + } } /** - * uint32 round = 13; - * @param value The round to set. - * @return This builder for chaining. + * repeated uint32 KNBIFCCIBLE = 11; + * @return A list containing the kNBIFCCIBLE. */ - public Builder setRound(int value) { - - round_ = value; - onChanged(); - return this; + public java.util.List + getKNBIFCCIBLEList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(kNBIFCCIBLE_) : kNBIFCCIBLE_; } /** - * uint32 round = 13; - * @return This builder for chaining. + * repeated uint32 KNBIFCCIBLE = 11; + * @return The count of kNBIFCCIBLE. */ - public Builder clearRound() { - - round_ = 0; - onChanged(); - return this; + public int getKNBIFCCIBLECount() { + return kNBIFCCIBLE_.size(); } - - private int levelId_ ; /** - * uint32 level_id = 4; - * @return The levelId. + * repeated uint32 KNBIFCCIBLE = 11; + * @param index The index of the element to return. + * @return The kNBIFCCIBLE at the given index. */ - @java.lang.Override - public int getLevelId() { - return levelId_; + public int getKNBIFCCIBLE(int index) { + return kNBIFCCIBLE_.getInt(index); } /** - * uint32 level_id = 4; - * @param value The levelId to set. + * repeated uint32 KNBIFCCIBLE = 11; + * @param index The index to set the value at. + * @param value The kNBIFCCIBLE to set. * @return This builder for chaining. */ - public Builder setLevelId(int value) { - - levelId_ = value; + public Builder setKNBIFCCIBLE( + int index, int value) { + ensureKNBIFCCIBLEIsMutable(); + kNBIFCCIBLE_.setInt(index, value); onChanged(); return this; } /** - * uint32 level_id = 4; + * repeated uint32 KNBIFCCIBLE = 11; + * @param value The kNBIFCCIBLE to add. * @return This builder for chaining. */ - public Builder clearLevelId() { - - levelId_ = 0; + public Builder addKNBIFCCIBLE(int value) { + ensureKNBIFCCIBLEIsMutable(); + kNBIFCCIBLE_.addInt(value); onChanged(); return this; } - - private com.google.protobuf.Internal.IntList scoreList_ = emptyIntList(); - private void ensureScoreListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - scoreList_ = mutableCopy(scoreList_); - bitField0_ |= 0x00000001; - } - } /** - * repeated uint32 score_list = 7; - * @return A list containing the scoreList. + * repeated uint32 KNBIFCCIBLE = 11; + * @param values The kNBIFCCIBLE to add. + * @return This builder for chaining. */ - public java.util.List - getScoreListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(scoreList_) : scoreList_; + public Builder addAllKNBIFCCIBLE( + java.lang.Iterable values) { + ensureKNBIFCCIBLEIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, kNBIFCCIBLE_); + onChanged(); + return this; } /** - * repeated uint32 score_list = 7; - * @return The count of scoreList. + * repeated uint32 KNBIFCCIBLE = 11; + * @return This builder for chaining. */ - public int getScoreListCount() { - return scoreList_.size(); + public Builder clearKNBIFCCIBLE() { + kNBIFCCIBLE_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; } + + private int pJJAOILBFBN_ ; /** - * repeated uint32 score_list = 7; - * @param index The index of the element to return. - * @return The scoreList at the given index. + * uint32 PJJAOILBFBN = 12; + * @return The pJJAOILBFBN. */ - public int getScoreList(int index) { - return scoreList_.getInt(index); + @java.lang.Override + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } /** - * repeated uint32 score_list = 7; - * @param index The index to set the value at. - * @param value The scoreList to set. + * uint32 PJJAOILBFBN = 12; + * @param value The pJJAOILBFBN to set. * @return This builder for chaining. */ - public Builder setScoreList( - int index, int value) { - ensureScoreListIsMutable(); - scoreList_.setInt(index, value); + public Builder setPJJAOILBFBN(int value) { + + pJJAOILBFBN_ = value; onChanged(); return this; } /** - * repeated uint32 score_list = 7; - * @param value The scoreList to add. + * uint32 PJJAOILBFBN = 12; * @return This builder for chaining. */ - public Builder addScoreList(int value) { - ensureScoreListIsMutable(); - scoreList_.addInt(value); + public Builder clearPJJAOILBFBN() { + + pJJAOILBFBN_ = 0; onChanged(); return this; } + + private int pBKEAOCBPMN_ ; + /** + * uint32 PBKEAOCBPMN = 13; + * @return The pBKEAOCBPMN. + */ + @java.lang.Override + public int getPBKEAOCBPMN() { + return pBKEAOCBPMN_; + } /** - * repeated uint32 score_list = 7; - * @param values The scoreList to add. + * uint32 PBKEAOCBPMN = 13; + * @param value The pBKEAOCBPMN to set. * @return This builder for chaining. */ - public Builder addAllScoreList( - java.lang.Iterable values) { - ensureScoreListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, scoreList_); + public Builder setPBKEAOCBPMN(int value) { + + pBKEAOCBPMN_ = value; onChanged(); return this; } /** - * repeated uint32 score_list = 7; + * uint32 PBKEAOCBPMN = 13; * @return This builder for chaining. */ - public Builder clearScoreList() { - scoreList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder clearPBKEAOCBPMN() { + + pBKEAOCBPMN_ = 0; onChanged(); return this; } @@ -1002,12 +994,12 @@ public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.Instab descriptor; static { java.lang.String[] descriptorData = { - "\n$InstableSprayDungeonSettleInfo.proto\"\222" + - "\001\n\036InstableSprayDungeonSettleInfo\022\025\n\ris_" + - "new_record\030\017 \001(\010\022\022\n\ndifficulty\030\010 \001(\r\022\020\n\010" + - "stage_id\030\005 \001(\r\022\r\n\005round\030\r \001(\r\022\020\n\010level_i" + - "d\030\004 \001(\r\022\022\n\nscore_list\030\007 \003(\rB\033\n\031emu.grass" + - "cutter.net.protob\006proto3" + "\n$InstableSprayDungeonSettleInfo.proto\"\240" + + "\001\n\036InstableSprayDungeonSettleInfo\022\023\n\013MEM" + + "PKCGNNMF\030\004 \001(\r\022\023\n\013DMNLDPPGOKG\030\005 \001(\r\022\025\n\ri" + + "s_new_record\030\007 \001(\010\022\023\n\013KNBIFCCIBLE\030\013 \003(\r\022" + + "\023\n\013PJJAOILBFBN\030\014 \001(\r\022\023\n\013PBKEAOCBPMN\030\r \001(" + + "\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1018,7 +1010,7 @@ public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.Instab internal_static_InstableSprayDungeonSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_InstableSprayDungeonSettleInfo_descriptor, - new java.lang.String[] { "IsNewRecord", "Difficulty", "StageId", "Round", "LevelId", "ScoreList", }); + new java.lang.String[] { "MEMPKCGNNMF", "DMNLDPPGOKG", "IsNewRecord", "KNBIFCCIBLE", "PJJAOILBFBN", "PBKEAOCBPMN", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/LevelupCityReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/LevelupCityReqOuterClass.java index 41544e06629..db3693192e6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/LevelupCityReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/LevelupCityReqOuterClass.java @@ -19,27 +19,27 @@ public interface LevelupCityReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 scene_id = 11; + * uint32 item_num = 15; + * @return The itemNum. + */ + int getItemNum(); + + /** + * uint32 scene_id = 12; * @return The sceneId. */ int getSceneId(); /** - * uint32 area_id = 3; + * uint32 area_id = 4; * @return The areaId. */ int getAreaId(); - - /** - * uint32 item_num = 1; - * @return The itemNum. - */ - int getItemNum(); } /** * 
-   * CmdId: 8097
-   * Obf: DAIDHECFAML
+   * CmdId: 8394
+   * obf: EDHDFLLJLJH
    *
* * Protobuf type {@code LevelupCityReq} @@ -86,19 +86,19 @@ private LevelupCityReq( case 0: done = true; break; - case 8: { + case 32: { - itemNum_ = input.readUInt32(); + areaId_ = input.readUInt32(); break; } - case 24: { + case 96: { - areaId_ = input.readUInt32(); + sceneId_ = input.readUInt32(); break; } - case 88: { + case 120: { - sceneId_ = input.readUInt32(); + itemNum_ = input.readUInt32(); break; } default: { @@ -133,10 +133,21 @@ private LevelupCityReq( emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq.class, emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq.Builder.class); } - public static final int SCENE_ID_FIELD_NUMBER = 11; + public static final int ITEM_NUM_FIELD_NUMBER = 15; + private int itemNum_; + /** + * uint32 item_num = 15; + * @return The itemNum. + */ + @java.lang.Override + public int getItemNum() { + return itemNum_; + } + + public static final int SCENE_ID_FIELD_NUMBER = 12; private int sceneId_; /** - * uint32 scene_id = 11; + * uint32 scene_id = 12; * @return The sceneId. */ @java.lang.Override @@ -144,10 +155,10 @@ public int getSceneId() { return sceneId_; } - public static final int AREA_ID_FIELD_NUMBER = 3; + public static final int AREA_ID_FIELD_NUMBER = 4; private int areaId_; /** - * uint32 area_id = 3; + * uint32 area_id = 4; * @return The areaId. */ @java.lang.Override @@ -155,17 +166,6 @@ public int getAreaId() { return areaId_; } - public static final int ITEM_NUM_FIELD_NUMBER = 1; - private int itemNum_; - /** - * uint32 item_num = 1; - * @return The itemNum. - */ - @java.lang.Override - public int getItemNum() { - return itemNum_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (itemNum_ != 0) { - output.writeUInt32(1, itemNum_); - } if (areaId_ != 0) { - output.writeUInt32(3, areaId_); + output.writeUInt32(4, areaId_); } if (sceneId_ != 0) { - output.writeUInt32(11, sceneId_); + output.writeUInt32(12, sceneId_); + } + if (itemNum_ != 0) { + output.writeUInt32(15, itemNum_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (itemNum_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, itemNum_); - } if (areaId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, areaId_); + .computeUInt32Size(4, areaId_); } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, sceneId_); + .computeUInt32Size(12, sceneId_); + } + if (itemNum_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(15, itemNum_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +225,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq other = (emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq) obj; + if (getItemNum() + != other.getItemNum()) return false; if (getSceneId() != other.getSceneId()) return false; if (getAreaId() != other.getAreaId()) return false; - if (getItemNum() - != other.getItemNum()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +242,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ITEM_NUM_FIELD_NUMBER; + hash = (53 * hash) + getItemNum(); hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); hash = (37 * hash) + AREA_ID_FIELD_NUMBER; hash = (53 * hash) + getAreaId(); - hash = (37 * hash) + ITEM_NUM_FIELD_NUMBER; - hash = (53 * hash) + getItemNum(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 8097
-     * Obf: DAIDHECFAML
+     * CmdId: 8394
+     * obf: EDHDFLLJLJH
      *
* * Protobuf type {@code LevelupCityReq} @@ -386,12 +386,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + itemNum_ = 0; + sceneId_ = 0; areaId_ = 0; - itemNum_ = 0; - return this; } @@ -418,9 +418,9 @@ public emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq build() @java.lang.Override public emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq buildPartial() { emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq result = new emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq(this); + result.itemNum_ = itemNum_; result.sceneId_ = sceneId_; result.areaId_ = areaId_; - result.itemNum_ = itemNum_; onBuilt(); return result; } @@ -469,15 +469,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq other) { if (other == emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq.getDefaultInstance()) return this; + if (other.getItemNum() != 0) { + setItemNum(other.getItemNum()); + } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } if (other.getAreaId() != 0) { setAreaId(other.getAreaId()); } - if (other.getItemNum() != 0) { - setItemNum(other.getItemNum()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -507,95 +507,95 @@ public Builder mergeFrom( return this; } - private int sceneId_ ; + private int itemNum_ ; /** - * uint32 scene_id = 11; - * @return The sceneId. + * uint32 item_num = 15; + * @return The itemNum. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getItemNum() { + return itemNum_; } /** - * uint32 scene_id = 11; - * @param value The sceneId to set. + * uint32 item_num = 15; + * @param value The itemNum to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setItemNum(int value) { - sceneId_ = value; + itemNum_ = value; onChanged(); return this; } /** - * uint32 scene_id = 11; + * uint32 item_num = 15; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearItemNum() { - sceneId_ = 0; + itemNum_ = 0; onChanged(); return this; } - private int areaId_ ; + private int sceneId_ ; /** - * uint32 area_id = 3; - * @return The areaId. + * uint32 scene_id = 12; + * @return The sceneId. */ @java.lang.Override - public int getAreaId() { - return areaId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 area_id = 3; - * @param value The areaId to set. + * uint32 scene_id = 12; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setAreaId(int value) { + public Builder setSceneId(int value) { - areaId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 area_id = 3; + * uint32 scene_id = 12; * @return This builder for chaining. */ - public Builder clearAreaId() { + public Builder clearSceneId() { - areaId_ = 0; + sceneId_ = 0; onChanged(); return this; } - private int itemNum_ ; + private int areaId_ ; /** - * uint32 item_num = 1; - * @return The itemNum. + * uint32 area_id = 4; + * @return The areaId. */ @java.lang.Override - public int getItemNum() { - return itemNum_; + public int getAreaId() { + return areaId_; } /** - * uint32 item_num = 1; - * @param value The itemNum to set. + * uint32 area_id = 4; + * @param value The areaId to set. * @return This builder for chaining. */ - public Builder setItemNum(int value) { + public Builder setAreaId(int value) { - itemNum_ = value; + areaId_ = value; onChanged(); return this; } /** - * uint32 item_num = 1; + * uint32 area_id = 4; * @return This builder for chaining. */ - public Builder clearItemNum() { + public Builder clearAreaId() { - itemNum_ = 0; + areaId_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq getDefa static { java.lang.String[] descriptorData = { "\n\024LevelupCityReq.proto\"E\n\016LevelupCityReq" + - "\022\020\n\010scene_id\030\013 \001(\r\022\017\n\007area_id\030\003 \001(\r\022\020\n\010i" + - "tem_num\030\001 \001(\rB\033\n\031emu.grasscutter.net.pro" + + "\022\020\n\010item_num\030\017 \001(\r\022\020\n\010scene_id\030\014 \001(\r\022\017\n\007" + + "area_id\030\004 \001(\rB\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.LevelupCityReqOuterClass.LevelupCityReq getDefa internal_static_LevelupCityReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_LevelupCityReq_descriptor, - new java.lang.String[] { "SceneId", "AreaId", "ItemNum", }); + new java.lang.String[] { "ItemNum", "SceneId", "AreaId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/LevelupCityRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/LevelupCityRspOuterClass.java index 64c67022b57..04d7de48519 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/LevelupCityRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/LevelupCityRspOuterClass.java @@ -19,42 +19,42 @@ public interface LevelupCityRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .CityInfo city_info = 13; + * uint32 area_id = 4; + * @return The areaId. + */ + int getAreaId(); + + /** + * uint32 scene_id = 6; + * @return The sceneId. + */ + int getSceneId(); + + /** + * .CityInfo city_info = 9; * @return Whether the cityInfo field is set. */ boolean hasCityInfo(); /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; * @return The cityInfo. */ emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfo(); /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoOrBuilder(); /** - * uint32 scene_id = 12; - * @return The sceneId. - */ - int getSceneId(); - - /** - * uint32 area_id = 8; - * @return The areaId. - */ - int getAreaId(); - - /** - * int32 retcode = 3; + * int32 retcode = 13; * @return The retcode. */ int getRetcode(); } /** * 
-   * CmdId: 9797
-   * Obf: IOPGGBHIHIC
+   * CmdId: 3655
+   * obf: MBPFIKHBCHD
    *
* * Protobuf type {@code LevelupCityRsp} @@ -101,22 +101,17 @@ private LevelupCityRsp( case 0: done = true; break; - case 24: { - - retcode_ = input.readInt32(); - break; - } - case 64: { + case 32: { areaId_ = input.readUInt32(); break; } - case 96: { + case 48: { sceneId_ = input.readUInt32(); break; } - case 106: { + case 74: { emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder subBuilder = null; if (cityInfo_ != null) { subBuilder = cityInfo_.toBuilder(); @@ -129,6 +124,11 @@ private LevelupCityRsp( break; } + case 104: { + + retcode_ = input.readInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -161,10 +161,32 @@ private LevelupCityRsp( emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp.class, emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp.Builder.class); } - public static final int CITY_INFO_FIELD_NUMBER = 13; + public static final int AREA_ID_FIELD_NUMBER = 4; + private int areaId_; + /** + * uint32 area_id = 4; + * @return The areaId. + */ + @java.lang.Override + public int getAreaId() { + return areaId_; + } + + public static final int SCENE_ID_FIELD_NUMBER = 6; + private int sceneId_; + /** + * uint32 scene_id = 6; + * @return The sceneId. + */ + @java.lang.Override + public int getSceneId() { + return sceneId_; + } + + public static final int CITY_INFO_FIELD_NUMBER = 9; private emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo cityInfo_; /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; * @return Whether the cityInfo field is set. */ @java.lang.Override @@ -172,7 +194,7 @@ public boolean hasCityInfo() { return cityInfo_ != null; } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; * @return The cityInfo. */ @java.lang.Override @@ -180,39 +202,17 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfo() { return cityInfo_ == null ? emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.getDefaultInstance() : cityInfo_; } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ @java.lang.Override public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoOrBuilder() { return getCityInfo(); } - public static final int SCENE_ID_FIELD_NUMBER = 12; - private int sceneId_; - /** - * uint32 scene_id = 12; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - - public static final int AREA_ID_FIELD_NUMBER = 8; - private int areaId_; - /** - * uint32 area_id = 8; - * @return The areaId. - */ - @java.lang.Override - public int getAreaId() { - return areaId_; - } - - public static final int RETCODE_FIELD_NUMBER = 3; + public static final int RETCODE_FIELD_NUMBER = 13; private int retcode_; /** - * int32 retcode = 3; + * int32 retcode = 13; * @return The retcode. */ @java.lang.Override @@ -234,17 +234,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (retcode_ != 0) { - output.writeInt32(3, retcode_); - } if (areaId_ != 0) { - output.writeUInt32(8, areaId_); + output.writeUInt32(4, areaId_); } if (sceneId_ != 0) { - output.writeUInt32(12, sceneId_); + output.writeUInt32(6, sceneId_); } if (cityInfo_ != null) { - output.writeMessage(13, getCityInfo()); + output.writeMessage(9, getCityInfo()); + } + if (retcode_ != 0) { + output.writeInt32(13, retcode_); } unknownFields.writeTo(output); } @@ -255,21 +255,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, retcode_); - } if (areaId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, areaId_); + .computeUInt32Size(4, areaId_); } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, sceneId_); + .computeUInt32Size(6, sceneId_); } if (cityInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, getCityInfo()); + .computeMessageSize(9, getCityInfo()); + } + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(13, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -286,15 +286,15 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp other = (emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp) obj; + if (getAreaId() + != other.getAreaId()) return false; + if (getSceneId() + != other.getSceneId()) return false; if (hasCityInfo() != other.hasCityInfo()) return false; if (hasCityInfo()) { if (!getCityInfo() .equals(other.getCityInfo())) return false; } - if (getSceneId() - != other.getSceneId()) return false; - if (getAreaId() - != other.getAreaId()) return false; if (getRetcode() != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -308,14 +308,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + AREA_ID_FIELD_NUMBER; + hash = (53 * hash) + getAreaId(); + hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSceneId(); if (hasCityInfo()) { hash = (37 * hash) + CITY_INFO_FIELD_NUMBER; hash = (53 * hash) + getCityInfo().hashCode(); } - hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; - hash = (53 * hash) + getSceneId(); - hash = (37 * hash) + AREA_ID_FIELD_NUMBER; - hash = (53 * hash) + getAreaId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); @@ -415,8 +415,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 9797
-     * Obf: IOPGGBHIHIC
+     * CmdId: 3655
+     * obf: MBPFIKHBCHD
      *
* * Protobuf type {@code LevelupCityRsp} @@ -456,16 +456,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + areaId_ = 0; + + sceneId_ = 0; + if (cityInfoBuilder_ == null) { cityInfo_ = null; } else { cityInfo_ = null; cityInfoBuilder_ = null; } - sceneId_ = 0; - - areaId_ = 0; - retcode_ = 0; return this; @@ -494,13 +494,13 @@ public emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp build() @java.lang.Override public emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp buildPartial() { emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp result = new emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp(this); + result.areaId_ = areaId_; + result.sceneId_ = sceneId_; if (cityInfoBuilder_ == null) { result.cityInfo_ = cityInfo_; } else { result.cityInfo_ = cityInfoBuilder_.build(); } - result.sceneId_ = sceneId_; - result.areaId_ = areaId_; result.retcode_ = retcode_; onBuilt(); return result; @@ -550,14 +550,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp other) { if (other == emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp.getDefaultInstance()) return this; - if (other.hasCityInfo()) { - mergeCityInfo(other.getCityInfo()); + if (other.getAreaId() != 0) { + setAreaId(other.getAreaId()); } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } - if (other.getAreaId() != 0) { - setAreaId(other.getAreaId()); + if (other.hasCityInfo()) { + mergeCityInfo(other.getCityInfo()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); @@ -591,18 +591,80 @@ public Builder mergeFrom( return this; } + private int areaId_ ; + /** + * uint32 area_id = 4; + * @return The areaId. + */ + @java.lang.Override + public int getAreaId() { + return areaId_; + } + /** + * uint32 area_id = 4; + * @param value The areaId to set. + * @return This builder for chaining. + */ + public Builder setAreaId(int value) { + + areaId_ = value; + onChanged(); + return this; + } + /** + * uint32 area_id = 4; + * @return This builder for chaining. + */ + public Builder clearAreaId() { + + areaId_ = 0; + onChanged(); + return this; + } + + private int sceneId_ ; + /** + * uint32 scene_id = 6; + * @return The sceneId. + */ + @java.lang.Override + public int getSceneId() { + return sceneId_; + } + /** + * uint32 scene_id = 6; + * @param value The sceneId to set. + * @return This builder for chaining. + */ + public Builder setSceneId(int value) { + + sceneId_ = value; + onChanged(); + return this; + } + /** + * uint32 scene_id = 6; + * @return This builder for chaining. + */ + public Builder clearSceneId() { + + sceneId_ = 0; + onChanged(); + return this; + } + private emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo cityInfo_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> cityInfoBuilder_; /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; * @return Whether the cityInfo field is set. */ public boolean hasCityInfo() { return cityInfoBuilder_ != null || cityInfo_ != null; } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; * @return The cityInfo. */ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfo() { @@ -613,7 +675,7 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfo() { } } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ public Builder setCityInfo(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo value) { if (cityInfoBuilder_ == null) { @@ -629,7 +691,7 @@ public Builder setCityInfo(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo return this; } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ public Builder setCityInfo( emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder builderForValue) { @@ -643,7 +705,7 @@ public Builder setCityInfo( return this; } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ public Builder mergeCityInfo(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo value) { if (cityInfoBuilder_ == null) { @@ -661,7 +723,7 @@ public Builder mergeCityInfo(emu.grasscutter.net.proto.CityInfoOuterClass.CityIn return this; } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ public Builder clearCityInfo() { if (cityInfoBuilder_ == null) { @@ -675,7 +737,7 @@ public Builder clearCityInfo() { return this; } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder getCityInfoBuilder() { @@ -683,7 +745,7 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder getCityInfo return getCityInfoFieldBuilder().getBuilder(); } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoOrBuilder() { if (cityInfoBuilder_ != null) { @@ -694,7 +756,7 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInf } } /** - * .CityInfo city_info = 13; + * .CityInfo city_info = 9; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> @@ -710,71 +772,9 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInf return cityInfoBuilder_; } - private int sceneId_ ; - /** - * uint32 scene_id = 12; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - /** - * uint32 scene_id = 12; - * @param value The sceneId to set. - * @return This builder for chaining. - */ - public Builder setSceneId(int value) { - - sceneId_ = value; - onChanged(); - return this; - } - /** - * uint32 scene_id = 12; - * @return This builder for chaining. - */ - public Builder clearSceneId() { - - sceneId_ = 0; - onChanged(); - return this; - } - - private int areaId_ ; - /** - * uint32 area_id = 8; - * @return The areaId. - */ - @java.lang.Override - public int getAreaId() { - return areaId_; - } - /** - * uint32 area_id = 8; - * @param value The areaId to set. - * @return This builder for chaining. - */ - public Builder setAreaId(int value) { - - areaId_ = value; - onChanged(); - return this; - } - /** - * uint32 area_id = 8; - * @return This builder for chaining. - */ - public Builder clearAreaId() { - - areaId_ = 0; - onChanged(); - return this; - } - private int retcode_ ; /** - * int32 retcode = 3; + * int32 retcode = 13; * @return The retcode. */ @java.lang.Override @@ -782,7 +782,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 3; + * int32 retcode = 13; * @param value The retcode to set. * @return This builder for chaining. */ @@ -793,7 +793,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 3; + * int32 retcode = 13; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -870,9 +870,9 @@ public emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp getDefa static { java.lang.String[] descriptorData = { "\n\024LevelupCityRsp.proto\032\016CityInfo.proto\"b" + - "\n\016LevelupCityRsp\022\034\n\tcity_info\030\r \001(\0132\t.Ci" + - "tyInfo\022\020\n\010scene_id\030\014 \001(\r\022\017\n\007area_id\030\010 \001(" + - "\r\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu.grasscutter.ne" + + "\n\016LevelupCityRsp\022\017\n\007area_id\030\004 \001(\r\022\020\n\010sce" + + "ne_id\030\006 \001(\r\022\034\n\tcity_info\030\t \001(\0132\t.CityInf" + + "o\022\017\n\007retcode\030\r \001(\005B\033\n\031emu.grasscutter.ne" + "t.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -885,7 +885,7 @@ public emu.grasscutter.net.proto.LevelupCityRspOuterClass.LevelupCityRsp getDefa internal_static_LevelupCityRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_LevelupCityRsp_descriptor, - new java.lang.String[] { "CityInfo", "SceneId", "AreaId", "Retcode", }); + new java.lang.String[] { "AreaId", "SceneId", "CityInfo", "Retcode", }); emu.grasscutter.net.proto.CityInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/LockedPersonallineDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/LockedPersonallineDataOuterClass.java index c448fca0585..793c807d8d5 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/LockedPersonallineDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/LockedPersonallineDataOuterClass.java @@ -19,64 +19,64 @@ public interface LockedPersonallineDataOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 personal_line_id = 10; + * .LockedPersonallineData.LockReason lock_reason = 6; + * @return The enum numeric value on the wire for lockReason. + */ + int getLockReasonValue(); + /** + * .LockedPersonallineData.LockReason lock_reason = 6; + * @return The lockReason. + */ + emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason getLockReason(); + + /** + * uint32 personal_line_id = 9; * @return The personalLineId. */ int getPersonalLineId(); /** - * .LockedPersonallineData.LockReason lock_reason = 4; - * @return The enum numeric value on the wire for lockReason. + * .LockedPersonallineData.QuestParam quest_param = 2; + * @return Whether the questParam field is set. */ - int getLockReasonValue(); + boolean hasQuestParam(); /** - * .LockedPersonallineData.LockReason lock_reason = 4; - * @return The lockReason. + * .LockedPersonallineData.QuestParam quest_param = 2; + * @return The questParam. */ - emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason getLockReason(); + emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam getQuestParam(); + /** + * .LockedPersonallineData.QuestParam quest_param = 2; + */ + emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParamOrBuilder getQuestParamOrBuilder(); /** - * uint32 chapter_id = 7; + * uint32 chapter_id = 3; * @return Whether the chapterId field is set. */ boolean hasChapterId(); /** - * uint32 chapter_id = 7; + * uint32 chapter_id = 3; * @return The chapterId. */ int getChapterId(); /** - * uint32 level = 13; + * uint32 level = 4; * @return Whether the level field is set. */ boolean hasLevel(); /** - * uint32 level = 13; + * uint32 level = 4; * @return The level. */ int getLevel(); - /** - * .LockedPersonallineData.QuestParam quest_param = 12; - * @return Whether the questParam field is set. - */ - boolean hasQuestParam(); - /** - * .LockedPersonallineData.QuestParam quest_param = 12; - * @return The questParam. - */ - emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam getQuestParam(); - /** - * .LockedPersonallineData.QuestParam quest_param = 12; - */ - emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParamOrBuilder getQuestParamOrBuilder(); - public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.ParamCase getParamCase(); } /** * 
-   * Obf: KGFDBLAPENJ
+   * obf: AFPBDGHDJDN
    *
* * Protobuf type {@code LockedPersonallineData} @@ -124,25 +124,9 @@ private LockedPersonallineData( case 0: done = true; break; - case 32: { - int rawValue = input.readEnum(); - - lockReason_ = rawValue; - break; - } - case 56: { - paramCase_ = 7; - param_ = input.readUInt32(); - break; - } - case 80: { - - personalLineId_ = input.readUInt32(); - break; - } - case 98: { + case 18: { emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.Builder subBuilder = null; - if (paramCase_ == 12) { + if (paramCase_ == 2) { subBuilder = ((emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_).toBuilder(); } param_ = @@ -151,14 +135,30 @@ private LockedPersonallineData( subBuilder.mergeFrom((emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_); param_ = subBuilder.buildPartial(); } - paramCase_ = 12; + paramCase_ = 2; + break; + } + case 24: { + paramCase_ = 3; + param_ = input.readUInt32(); break; } - case 104: { - paramCase_ = 13; + case 32: { + paramCase_ = 4; param_ = input.readUInt32(); break; } + case 48: { + int rawValue = input.readEnum(); + + lockReason_ = rawValue; + break; + } + case 72: { + + personalLineId_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -193,7 +193,7 @@ private LockedPersonallineData( /** * 
-     * Obf: ONPJFEHGHMM
+     * obf: PMOBCONJBEF
      *
* * Protobuf enum {@code LockedPersonallineData.LockReason} @@ -308,20 +308,20 @@ public interface QuestParamOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 chapter_id = 10; + * uint32 chapter_id = 1; * @return The chapterId. */ int getChapterId(); /** - * uint32 quest_id = 7; + * uint32 quest_id = 10; * @return The questId. */ int getQuestId(); } /** * 
-     * Obf: EDNGHGCCDGF
+     * obf: PKBADBMIDHJ
      *
* * Protobuf type {@code LockedPersonallineData.QuestParam} @@ -368,14 +368,14 @@ private QuestParam( case 0: done = true; break; - case 56: { + case 8: { - questId_ = input.readUInt32(); + chapterId_ = input.readUInt32(); break; } case 80: { - chapterId_ = input.readUInt32(); + questId_ = input.readUInt32(); break; } default: { @@ -410,10 +410,10 @@ private QuestParam( emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.class, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.Builder.class); } - public static final int CHAPTER_ID_FIELD_NUMBER = 10; + public static final int CHAPTER_ID_FIELD_NUMBER = 1; private int chapterId_; /** - * uint32 chapter_id = 10; + * uint32 chapter_id = 1; * @return The chapterId. */ @java.lang.Override @@ -421,10 +421,10 @@ public int getChapterId() { return chapterId_; } - public static final int QUEST_ID_FIELD_NUMBER = 7; + public static final int QUEST_ID_FIELD_NUMBER = 10; private int questId_; /** - * uint32 quest_id = 7; + * uint32 quest_id = 10; * @return The questId. */ @java.lang.Override @@ -446,11 +446,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (questId_ != 0) { - output.writeUInt32(7, questId_); - } if (chapterId_ != 0) { - output.writeUInt32(10, chapterId_); + output.writeUInt32(1, chapterId_); + } + if (questId_ != 0) { + output.writeUInt32(10, questId_); } unknownFields.writeTo(output); } @@ -461,13 +461,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (questId_ != 0) { + if (chapterId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, questId_); + .computeUInt32Size(1, chapterId_); } - if (chapterId_ != 0) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, chapterId_); + .computeUInt32Size(10, questId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -600,7 +600,7 @@ protected Builder newBuilderForType( } /** * 
-       * Obf: EDNGHGCCDGF
+       * obf: PKBADBMIDHJ
        *
* * Protobuf type {@code LockedPersonallineData.QuestParam} @@ -757,7 +757,7 @@ public Builder mergeFrom( private int chapterId_ ; /** - * uint32 chapter_id = 10; + * uint32 chapter_id = 1; * @return The chapterId. */ @java.lang.Override @@ -765,7 +765,7 @@ public int getChapterId() { return chapterId_; } /** - * uint32 chapter_id = 10; + * uint32 chapter_id = 1; * @param value The chapterId to set. * @return This builder for chaining. */ @@ -776,7 +776,7 @@ public Builder setChapterId(int value) { return this; } /** - * uint32 chapter_id = 10; + * uint32 chapter_id = 1; * @return This builder for chaining. */ public Builder clearChapterId() { @@ -788,7 +788,7 @@ public Builder clearChapterId() { private int questId_ ; /** - * uint32 quest_id = 7; + * uint32 quest_id = 10; * @return The questId. */ @java.lang.Override @@ -796,7 +796,7 @@ public int getQuestId() { return questId_; } /** - * uint32 quest_id = 7; + * uint32 quest_id = 10; * @param value The questId to set. * @return This builder for chaining. */ @@ -807,7 +807,7 @@ public Builder setQuestId(int value) { return this; } /** - * uint32 quest_id = 7; + * uint32 quest_id = 10; * @return This builder for chaining. */ public Builder clearQuestId() { @@ -874,9 +874,9 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal public enum ParamCase implements com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { - CHAPTER_ID(7), - LEVEL(13), - QUEST_PARAM(12), + QUEST_PARAM(2), + CHAPTER_ID(3), + LEVEL(4), PARAM_NOT_SET(0); private final int value; private ParamCase(int value) { @@ -894,9 +894,9 @@ public static ParamCase valueOf(int value) { public static ParamCase forNumber(int value) { switch (value) { - case 7: return CHAPTER_ID; - case 13: return LEVEL; - case 12: return QUEST_PARAM; + case 2: return QUEST_PARAM; + case 3: return CHAPTER_ID; + case 4: return LEVEL; case 0: return PARAM_NOT_SET; default: return null; } @@ -912,28 +912,17 @@ public int getNumber() { paramCase_); } - public static final int PERSONAL_LINE_ID_FIELD_NUMBER = 10; - private int personalLineId_; - /** - * uint32 personal_line_id = 10; - * @return The personalLineId. - */ - @java.lang.Override - public int getPersonalLineId() { - return personalLineId_; - } - - public static final int LOCK_REASON_FIELD_NUMBER = 4; + public static final int LOCK_REASON_FIELD_NUMBER = 6; private int lockReason_; /** - * .LockedPersonallineData.LockReason lock_reason = 4; + * .LockedPersonallineData.LockReason lock_reason = 6; * @return The enum numeric value on the wire for lockReason. */ @java.lang.Override public int getLockReasonValue() { return lockReason_; } /** - * .LockedPersonallineData.LockReason lock_reason = 4; + * .LockedPersonallineData.LockReason lock_reason = 6; * @return The lockReason. */ @java.lang.Override public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason getLockReason() { @@ -942,77 +931,88 @@ public int getPersonalLineId() { return result == null ? emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason.UNRECOGNIZED : result; } - public static final int CHAPTER_ID_FIELD_NUMBER = 7; + public static final int PERSONAL_LINE_ID_FIELD_NUMBER = 9; + private int personalLineId_; /** - * uint32 chapter_id = 7; - * @return Whether the chapterId field is set. + * uint32 personal_line_id = 9; + * @return The personalLineId. */ @java.lang.Override - public boolean hasChapterId() { - return paramCase_ == 7; + public int getPersonalLineId() { + return personalLineId_; } + + public static final int QUEST_PARAM_FIELD_NUMBER = 2; /** - * uint32 chapter_id = 7; - * @return The chapterId. + * .LockedPersonallineData.QuestParam quest_param = 2; + * @return Whether the questParam field is set. */ @java.lang.Override - public int getChapterId() { - if (paramCase_ == 7) { - return (java.lang.Integer) param_; - } - return 0; + public boolean hasQuestParam() { + return paramCase_ == 2; } - - public static final int LEVEL_FIELD_NUMBER = 13; /** - * uint32 level = 13; - * @return Whether the level field is set. + * .LockedPersonallineData.QuestParam quest_param = 2; + * @return The questParam. */ @java.lang.Override - public boolean hasLevel() { - return paramCase_ == 13; + public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam getQuestParam() { + if (paramCase_ == 2) { + return (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_; + } + return emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance(); } /** - * uint32 level = 13; - * @return The level. + * .LockedPersonallineData.QuestParam quest_param = 2; */ @java.lang.Override - public int getLevel() { - if (paramCase_ == 13) { - return (java.lang.Integer) param_; + public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParamOrBuilder getQuestParamOrBuilder() { + if (paramCase_ == 2) { + return (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_; } - return 0; + return emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance(); } - public static final int QUEST_PARAM_FIELD_NUMBER = 12; + public static final int CHAPTER_ID_FIELD_NUMBER = 3; /** - * .LockedPersonallineData.QuestParam quest_param = 12; - * @return Whether the questParam field is set. + * uint32 chapter_id = 3; + * @return Whether the chapterId field is set. */ @java.lang.Override - public boolean hasQuestParam() { - return paramCase_ == 12; + public boolean hasChapterId() { + return paramCase_ == 3; } /** - * .LockedPersonallineData.QuestParam quest_param = 12; - * @return The questParam. + * uint32 chapter_id = 3; + * @return The chapterId. */ @java.lang.Override - public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam getQuestParam() { - if (paramCase_ == 12) { - return (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_; + public int getChapterId() { + if (paramCase_ == 3) { + return (java.lang.Integer) param_; } - return emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance(); + return 0; } + + public static final int LEVEL_FIELD_NUMBER = 4; /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * uint32 level = 4; + * @return Whether the level field is set. */ @java.lang.Override - public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParamOrBuilder getQuestParamOrBuilder() { - if (paramCase_ == 12) { - return (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_; + public boolean hasLevel() { + return paramCase_ == 4; + } + /** + * uint32 level = 4; + * @return The level. + */ + @java.lang.Override + public int getLevel() { + if (paramCase_ == 4) { + return (java.lang.Integer) param_; } - return emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance(); + return 0; } private byte memoizedIsInitialized = -1; @@ -1029,22 +1029,22 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (lockReason_ != emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason.LEVEL.getNumber()) { - output.writeEnum(4, lockReason_); + if (paramCase_ == 2) { + output.writeMessage(2, (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_); } - if (paramCase_ == 7) { + if (paramCase_ == 3) { output.writeUInt32( - 7, (int)((java.lang.Integer) param_)); + 3, (int)((java.lang.Integer) param_)); } - if (personalLineId_ != 0) { - output.writeUInt32(10, personalLineId_); + if (paramCase_ == 4) { + output.writeUInt32( + 4, (int)((java.lang.Integer) param_)); } - if (paramCase_ == 12) { - output.writeMessage(12, (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_); + if (lockReason_ != emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason.LEVEL.getNumber()) { + output.writeEnum(6, lockReason_); } - if (paramCase_ == 13) { - output.writeUInt32( - 13, (int)((java.lang.Integer) param_)); + if (personalLineId_ != 0) { + output.writeUInt32(9, personalLineId_); } unknownFields.writeTo(output); } @@ -1055,27 +1055,27 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (lockReason_ != emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason.LEVEL.getNumber()) { + if (paramCase_ == 2) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(4, lockReason_); + .computeMessageSize(2, (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_); } - if (paramCase_ == 7) { + if (paramCase_ == 3) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size( - 7, (int)((java.lang.Integer) param_)); + 3, (int)((java.lang.Integer) param_)); } - if (personalLineId_ != 0) { + if (paramCase_ == 4) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, personalLineId_); + .computeUInt32Size( + 4, (int)((java.lang.Integer) param_)); } - if (paramCase_ == 12) { + if (lockReason_ != emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason.LEVEL.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_); + .computeEnumSize(6, lockReason_); } - if (paramCase_ == 13) { + if (personalLineId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size( - 13, (int)((java.lang.Integer) param_)); + .computeUInt32Size(9, personalLineId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -1092,23 +1092,23 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData other = (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData) obj; + if (lockReason_ != other.lockReason_) return false; if (getPersonalLineId() != other.getPersonalLineId()) return false; - if (lockReason_ != other.lockReason_) return false; if (!getParamCase().equals(other.getParamCase())) return false; switch (paramCase_) { - case 7: + case 2: + if (!getQuestParam() + .equals(other.getQuestParam())) return false; + break; + case 3: if (getChapterId() != other.getChapterId()) return false; break; - case 13: + case 4: if (getLevel() != other.getLevel()) return false; break; - case 12: - if (!getQuestParam() - .equals(other.getQuestParam())) return false; - break; case 0: default: } @@ -1123,23 +1123,23 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PERSONAL_LINE_ID_FIELD_NUMBER; - hash = (53 * hash) + getPersonalLineId(); hash = (37 * hash) + LOCK_REASON_FIELD_NUMBER; hash = (53 * hash) + lockReason_; + hash = (37 * hash) + PERSONAL_LINE_ID_FIELD_NUMBER; + hash = (53 * hash) + getPersonalLineId(); switch (paramCase_) { - case 7: + case 2: + hash = (37 * hash) + QUEST_PARAM_FIELD_NUMBER; + hash = (53 * hash) + getQuestParam().hashCode(); + break; + case 3: hash = (37 * hash) + CHAPTER_ID_FIELD_NUMBER; hash = (53 * hash) + getChapterId(); break; - case 13: + case 4: hash = (37 * hash) + LEVEL_FIELD_NUMBER; hash = (53 * hash) + getLevel(); break; - case 12: - hash = (37 * hash) + QUEST_PARAM_FIELD_NUMBER; - hash = (53 * hash) + getQuestParam().hashCode(); - break; case 0: default: } @@ -1240,7 +1240,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: KGFDBLAPENJ
+     * obf: AFPBDGHDJDN
      *
* * Protobuf type {@code LockedPersonallineData} @@ -1280,10 +1280,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - personalLineId_ = 0; - lockReason_ = 0; + personalLineId_ = 0; + paramCase_ = 0; param_ = null; return this; @@ -1312,21 +1312,21 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal @java.lang.Override public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData buildPartial() { emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData result = new emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData(this); - result.personalLineId_ = personalLineId_; result.lockReason_ = lockReason_; - if (paramCase_ == 7) { - result.param_ = param_; - } - if (paramCase_ == 13) { - result.param_ = param_; - } - if (paramCase_ == 12) { + result.personalLineId_ = personalLineId_; + if (paramCase_ == 2) { if (questParamBuilder_ == null) { result.param_ = param_; } else { result.param_ = questParamBuilder_.build(); } } + if (paramCase_ == 3) { + result.param_ = param_; + } + if (paramCase_ == 4) { + result.param_ = param_; + } result.paramCase_ = paramCase_; onBuilt(); return result; @@ -1376,13 +1376,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData other) { if (other == emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.getDefaultInstance()) return this; - if (other.getPersonalLineId() != 0) { - setPersonalLineId(other.getPersonalLineId()); - } if (other.lockReason_ != 0) { setLockReasonValue(other.getLockReasonValue()); } + if (other.getPersonalLineId() != 0) { + setPersonalLineId(other.getPersonalLineId()); + } switch (other.getParamCase()) { + case QUEST_PARAM: { + mergeQuestParam(other.getQuestParam()); + break; + } case CHAPTER_ID: { setChapterId(other.getChapterId()); break; @@ -1391,10 +1395,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.LockedPersonallineDataOuterCl setLevel(other.getLevel()); break; } - case QUEST_PARAM: { - mergeQuestParam(other.getQuestParam()); - break; - } case PARAM_NOT_SET: { break; } @@ -1443,47 +1443,16 @@ public Builder clearParam() { } - private int personalLineId_ ; - /** - * uint32 personal_line_id = 10; - * @return The personalLineId. - */ - @java.lang.Override - public int getPersonalLineId() { - return personalLineId_; - } - /** - * uint32 personal_line_id = 10; - * @param value The personalLineId to set. - * @return This builder for chaining. - */ - public Builder setPersonalLineId(int value) { - - personalLineId_ = value; - onChanged(); - return this; - } - /** - * uint32 personal_line_id = 10; - * @return This builder for chaining. - */ - public Builder clearPersonalLineId() { - - personalLineId_ = 0; - onChanged(); - return this; - } - private int lockReason_ = 0; /** - * .LockedPersonallineData.LockReason lock_reason = 4; + * .LockedPersonallineData.LockReason lock_reason = 6; * @return The enum numeric value on the wire for lockReason. */ @java.lang.Override public int getLockReasonValue() { return lockReason_; } /** - * .LockedPersonallineData.LockReason lock_reason = 4; + * .LockedPersonallineData.LockReason lock_reason = 6; * @param value The enum numeric value on the wire for lockReason to set. * @return This builder for chaining. */ @@ -1494,7 +1463,7 @@ public Builder setLockReasonValue(int value) { return this; } /** - * .LockedPersonallineData.LockReason lock_reason = 4; + * .LockedPersonallineData.LockReason lock_reason = 6; * @return The lockReason. */ @java.lang.Override @@ -1504,7 +1473,7 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal return result == null ? emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.LockReason.UNRECOGNIZED : result; } /** - * .LockedPersonallineData.LockReason lock_reason = 4; + * .LockedPersonallineData.LockReason lock_reason = 6; * @param value The lockReason to set. * @return This builder for chaining. */ @@ -1518,7 +1487,7 @@ public Builder setLockReason(emu.grasscutter.net.proto.LockedPersonallineDataOut return this; } /** - * .LockedPersonallineData.LockReason lock_reason = 4; + * .LockedPersonallineData.LockReason lock_reason = 6; * @return This builder for chaining. */ public Builder clearLockReason() { @@ -1528,118 +1497,67 @@ public Builder clearLockReason() { return this; } + private int personalLineId_ ; /** - * uint32 chapter_id = 7; - * @return Whether the chapterId field is set. - */ - public boolean hasChapterId() { - return paramCase_ == 7; - } - /** - * uint32 chapter_id = 7; - * @return The chapterId. + * uint32 personal_line_id = 9; + * @return The personalLineId. */ - public int getChapterId() { - if (paramCase_ == 7) { - return (java.lang.Integer) param_; - } - return 0; + @java.lang.Override + public int getPersonalLineId() { + return personalLineId_; } /** - * uint32 chapter_id = 7; - * @param value The chapterId to set. + * uint32 personal_line_id = 9; + * @param value The personalLineId to set. * @return This builder for chaining. */ - public Builder setChapterId(int value) { - paramCase_ = 7; - param_ = value; + public Builder setPersonalLineId(int value) { + + personalLineId_ = value; onChanged(); return this; } /** - * uint32 chapter_id = 7; - * @return This builder for chaining. - */ - public Builder clearChapterId() { - if (paramCase_ == 7) { - paramCase_ = 0; - param_ = null; - onChanged(); - } - return this; - } - - /** - * uint32 level = 13; - * @return Whether the level field is set. - */ - public boolean hasLevel() { - return paramCase_ == 13; - } - /** - * uint32 level = 13; - * @return The level. - */ - public int getLevel() { - if (paramCase_ == 13) { - return (java.lang.Integer) param_; - } - return 0; - } - /** - * uint32 level = 13; - * @param value The level to set. + * uint32 personal_line_id = 9; * @return This builder for chaining. */ - public Builder setLevel(int value) { - paramCase_ = 13; - param_ = value; + public Builder clearPersonalLineId() { + + personalLineId_ = 0; onChanged(); return this; } - /** - * uint32 level = 13; - * @return This builder for chaining. - */ - public Builder clearLevel() { - if (paramCase_ == 13) { - paramCase_ = 0; - param_ = null; - onChanged(); - } - return this; - } private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.Builder, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParamOrBuilder> questParamBuilder_; /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; * @return Whether the questParam field is set. */ @java.lang.Override public boolean hasQuestParam() { - return paramCase_ == 12; + return paramCase_ == 2; } /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; * @return The questParam. */ @java.lang.Override public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam getQuestParam() { if (questParamBuilder_ == null) { - if (paramCase_ == 12) { + if (paramCase_ == 2) { return (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_; } return emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance(); } else { - if (paramCase_ == 12) { + if (paramCase_ == 2) { return questParamBuilder_.getMessage(); } return emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance(); } } /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; */ public Builder setQuestParam(emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam value) { if (questParamBuilder_ == null) { @@ -1651,11 +1569,11 @@ public Builder setQuestParam(emu.grasscutter.net.proto.LockedPersonallineDataOut } else { questParamBuilder_.setMessage(value); } - paramCase_ = 12; + paramCase_ = 2; return this; } /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; */ public Builder setQuestParam( emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.Builder builderForValue) { @@ -1665,15 +1583,15 @@ public Builder setQuestParam( } else { questParamBuilder_.setMessage(builderForValue.build()); } - paramCase_ = 12; + paramCase_ = 2; return this; } /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; */ public Builder mergeQuestParam(emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam value) { if (questParamBuilder_ == null) { - if (paramCase_ == 12 && + if (paramCase_ == 2 && param_ != emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance()) { param_ = emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.newBuilder((emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_) .mergeFrom(value).buildPartial(); @@ -1682,26 +1600,26 @@ public Builder mergeQuestParam(emu.grasscutter.net.proto.LockedPersonallineDataO } onChanged(); } else { - if (paramCase_ == 12) { + if (paramCase_ == 2) { questParamBuilder_.mergeFrom(value); } questParamBuilder_.setMessage(value); } - paramCase_ = 12; + paramCase_ = 2; return this; } /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; */ public Builder clearQuestParam() { if (questParamBuilder_ == null) { - if (paramCase_ == 12) { + if (paramCase_ == 2) { paramCase_ = 0; param_ = null; onChanged(); } } else { - if (paramCase_ == 12) { + if (paramCase_ == 2) { paramCase_ = 0; param_ = null; } @@ -1710,33 +1628,33 @@ public Builder clearQuestParam() { return this; } /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; */ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.Builder getQuestParamBuilder() { return getQuestParamFieldBuilder().getBuilder(); } /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; */ @java.lang.Override public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParamOrBuilder getQuestParamOrBuilder() { - if ((paramCase_ == 12) && (questParamBuilder_ != null)) { + if ((paramCase_ == 2) && (questParamBuilder_ != null)) { return questParamBuilder_.getMessageOrBuilder(); } else { - if (paramCase_ == 12) { + if (paramCase_ == 2) { return (emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam) param_; } return emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance(); } } /** - * .LockedPersonallineData.QuestParam quest_param = 12; + * .LockedPersonallineData.QuestParam quest_param = 2; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.Builder, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParamOrBuilder> getQuestParamFieldBuilder() { if (questParamBuilder_ == null) { - if (!(paramCase_ == 12)) { + if (!(paramCase_ == 2)) { param_ = emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.QuestParam.getDefaultInstance(); } questParamBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -1746,10 +1664,92 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal isClean()); param_ = null; } - paramCase_ = 12; + paramCase_ = 2; onChanged();; return questParamBuilder_; } + + /** + * uint32 chapter_id = 3; + * @return Whether the chapterId field is set. + */ + public boolean hasChapterId() { + return paramCase_ == 3; + } + /** + * uint32 chapter_id = 3; + * @return The chapterId. + */ + public int getChapterId() { + if (paramCase_ == 3) { + return (java.lang.Integer) param_; + } + return 0; + } + /** + * uint32 chapter_id = 3; + * @param value The chapterId to set. + * @return This builder for chaining. + */ + public Builder setChapterId(int value) { + paramCase_ = 3; + param_ = value; + onChanged(); + return this; + } + /** + * uint32 chapter_id = 3; + * @return This builder for chaining. + */ + public Builder clearChapterId() { + if (paramCase_ == 3) { + paramCase_ = 0; + param_ = null; + onChanged(); + } + return this; + } + + /** + * uint32 level = 4; + * @return Whether the level field is set. + */ + public boolean hasLevel() { + return paramCase_ == 4; + } + /** + * uint32 level = 4; + * @return The level. + */ + public int getLevel() { + if (paramCase_ == 4) { + return (java.lang.Integer) param_; + } + return 0; + } + /** + * uint32 level = 4; + * @param value The level to set. + * @return This builder for chaining. + */ + public Builder setLevel(int value) { + paramCase_ = 4; + param_ = value; + onChanged(); + return this; + } + /** + * uint32 level = 4; + * @return This builder for chaining. + */ + public Builder clearLevel() { + if (paramCase_ == 4) { + paramCase_ = 0; + param_ = null; + onChanged(); + } + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1823,13 +1823,13 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal static { java.lang.String[] descriptorData = { "\n\034LockedPersonallineData.proto\"\256\002\n\026Locke" + - "dPersonallineData\022\030\n\020personal_line_id\030\n " + - "\001(\r\0227\n\013lock_reason\030\004 \001(\0162\".LockedPersona" + - "llineData.LockReason\022\024\n\nchapter_id\030\007 \001(\r" + - "H\000\022\017\n\005level\030\r \001(\rH\000\0229\n\013quest_param\030\014 \001(\013" + - "2\".LockedPersonallineData.QuestParamH\000\0322" + - "\n\nQuestParam\022\022\n\nchapter_id\030\n \001(\r\022\020\n\010ques" + - "t_id\030\007 \001(\r\"\"\n\nLockReason\022\t\n\005LEVEL\020\000\022\t\n\005Q" + + "dPersonallineData\0227\n\013lock_reason\030\006 \001(\0162\"" + + ".LockedPersonallineData.LockReason\022\030\n\020pe" + + "rsonal_line_id\030\t \001(\r\0229\n\013quest_param\030\002 \001(" + + "\0132\".LockedPersonallineData.QuestParamH\000\022" + + "\024\n\nchapter_id\030\003 \001(\rH\000\022\017\n\005level\030\004 \001(\rH\000\0322" + + "\n\nQuestParam\022\022\n\nchapter_id\030\001 \001(\r\022\020\n\010ques" + + "t_id\030\n \001(\r\"\"\n\nLockReason\022\t\n\005LEVEL\020\000\022\t\n\005Q" + "UEST\020\001B\007\n\005paramB\033\n\031emu.grasscutter.net.p" + "rotob\006proto3" }; @@ -1842,7 +1842,7 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal internal_static_LockedPersonallineData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_LockedPersonallineData_descriptor, - new java.lang.String[] { "PersonalLineId", "LockReason", "ChapterId", "Level", "QuestParam", "Param", }); + new java.lang.String[] { "LockReason", "PersonalLineId", "QuestParam", "ChapterId", "Level", "Param", }); internal_static_LockedPersonallineData_QuestParam_descriptor = internal_static_LockedPersonallineData_descriptor.getNestedTypes().get(0); internal_static_LockedPersonallineData_QuestParam_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MIMFBKCDIAKOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MIMFBKCDIAKOuterClass.java new file mode 100644 index 00000000000..b403f62d22f --- /dev/null +++ b/src/generated/main/java/emu/grasscutter/net/proto/MIMFBKCDIAKOuterClass.java @@ -0,0 +1,545 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: MIMFBKCDIAK.proto + +package emu.grasscutter.net.proto; + +public final class MIMFBKCDIAKOuterClass { + private MIMFBKCDIAKOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface MIMFBKCDIAKOrBuilder extends + // @@protoc_insertion_point(interface_extends:MIMFBKCDIAK) + com.google.protobuf.MessageOrBuilder { + + /** + * bool MFBLIHCPIJN = 1; + * @return The mFBLIHCPIJN. + */ + boolean getMFBLIHCPIJN(); + } + /** + * 
+   * CmdId: 20600
+   *
+ * + * Protobuf type {@code MIMFBKCDIAK} + */ + public static final class MIMFBKCDIAK extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:MIMFBKCDIAK) + MIMFBKCDIAKOrBuilder { + private static final long serialVersionUID = 0L; + // Use MIMFBKCDIAK.newBuilder() to construct. + private MIMFBKCDIAK(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private MIMFBKCDIAK() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new MIMFBKCDIAK(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private MIMFBKCDIAK( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + + mFBLIHCPIJN_ = input.readBool(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.internal_static_MIMFBKCDIAK_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.internal_static_MIMFBKCDIAK_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK.class, emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK.Builder.class); + } + + public static final int MFBLIHCPIJN_FIELD_NUMBER = 1; + private boolean mFBLIHCPIJN_; + /** + * bool MFBLIHCPIJN = 1; + * @return The mFBLIHCPIJN. + */ + @java.lang.Override + public boolean getMFBLIHCPIJN() { + return mFBLIHCPIJN_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (mFBLIHCPIJN_ != false) { + output.writeBool(1, mFBLIHCPIJN_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (mFBLIHCPIJN_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(1, mFBLIHCPIJN_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK)) { + return super.equals(obj); + } + emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK other = (emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK) obj; + + if (getMFBLIHCPIJN() + != other.getMFBLIHCPIJN()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MFBLIHCPIJN_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getMFBLIHCPIJN()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * CmdId: 20600
+     *
+ * + * Protobuf type {@code MIMFBKCDIAK} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:MIMFBKCDIAK) + emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAKOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.internal_static_MIMFBKCDIAK_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.internal_static_MIMFBKCDIAK_fieldAccessorTable + .ensureFieldAccessorsInitialized( + emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK.class, emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK.Builder.class); + } + + // Construct using emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + mFBLIHCPIJN_ = false; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.internal_static_MIMFBKCDIAK_descriptor; + } + + @java.lang.Override + public emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK getDefaultInstanceForType() { + return emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK.getDefaultInstance(); + } + + @java.lang.Override + public emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK build() { + emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK buildPartial() { + emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK result = new emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK(this); + result.mFBLIHCPIJN_ = mFBLIHCPIJN_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK) { + return mergeFrom((emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK other) { + if (other == emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK.getDefaultInstance()) return this; + if (other.getMFBLIHCPIJN() != false) { + setMFBLIHCPIJN(other.getMFBLIHCPIJN()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private boolean mFBLIHCPIJN_ ; + /** + * bool MFBLIHCPIJN = 1; + * @return The mFBLIHCPIJN. + */ + @java.lang.Override + public boolean getMFBLIHCPIJN() { + return mFBLIHCPIJN_; + } + /** + * bool MFBLIHCPIJN = 1; + * @param value The mFBLIHCPIJN to set. + * @return This builder for chaining. + */ + public Builder setMFBLIHCPIJN(boolean value) { + + mFBLIHCPIJN_ = value; + onChanged(); + return this; + } + /** + * bool MFBLIHCPIJN = 1; + * @return This builder for chaining. + */ + public Builder clearMFBLIHCPIJN() { + + mFBLIHCPIJN_ = false; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:MIMFBKCDIAK) + } + + // @@protoc_insertion_point(class_scope:MIMFBKCDIAK) + private static final emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK(); + } + + public static emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public MIMFBKCDIAK parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new MIMFBKCDIAK(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public emu.grasscutter.net.proto.MIMFBKCDIAKOuterClass.MIMFBKCDIAK getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_MIMFBKCDIAK_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_MIMFBKCDIAK_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\021MIMFBKCDIAK.proto\"\"\n\013MIMFBKCDIAK\022\023\n\013MF" + + "BLIHCPIJN\030\001 \001(\010B\033\n\031emu.grasscutter.net.p" + + "rotob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_MIMFBKCDIAK_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_MIMFBKCDIAK_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_MIMFBKCDIAK_descriptor, + new java.lang.String[] { "MFBLIHCPIJN", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MainCoopOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MainCoopOuterClass.java index 680bf424a04..e458706299e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MainCoopOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MainCoopOuterClass.java @@ -19,150 +19,150 @@ public interface MainCoopOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 self_confidence = 5; - * @return The selfConfidence. - */ - int getSelfConfidence(); - - /** - * .MainCoop.Status status = 1; - * @return The enum numeric value on the wire for status. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - int getStatusValue(); + int getEIAEIMKELEJCount(); /** - * .MainCoop.Status status = 1; - * @return The status. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status getStatus(); - + boolean containsEIAEIMKELEJ( + int key); /** - * repeated uint32 save_point_id_list = 9; - * @return A list containing the savePointIdList. + * Use {@link #getEIAEIMKELEJMap()} instead. */ - java.util.List getSavePointIdListList(); + @java.lang.Deprecated + java.util.Map + getEIAEIMKELEJ(); /** - * repeated uint32 save_point_id_list = 9; - * @return The count of savePointIdList. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - int getSavePointIdListCount(); + java.util.Map + getEIAEIMKELEJMap(); /** - * repeated uint32 save_point_id_list = 9; - * @param index The index of the element to return. - * @return The savePointIdList at the given index. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - int getSavePointIdList(int index); + int getEIAEIMKELEJOrDefault( + int key, + int defaultValue); /** - * uint32 id = 6; - * @return The id. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - int getId(); + + int getEIAEIMKELEJOrThrow( + int key); /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ - int getGEHNFJEPCJLCount(); + int getSeenEndingMapCount(); /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ - boolean containsGEHNFJEPCJL( + boolean containsSeenEndingMap( int key); /** - * Use {@link #getGEHNFJEPCJLMap()} instead. + * Use {@link #getSeenEndingMapMap()} instead. */ @java.lang.Deprecated java.util.Map - getGEHNFJEPCJL(); + getSeenEndingMap(); /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ java.util.Map - getGEHNFJEPCJLMap(); + getSeenEndingMapMap(); /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ - int getGEHNFJEPCJLOrDefault( + int getSeenEndingMapOrDefault( int key, int defaultValue); /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ - int getGEHNFJEPCJLOrThrow( + int getSeenEndingMapOrThrow( int key); /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ - int getGDBKBKACDFOCount(); + int getGBHMAGADALJCount(); /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ - boolean containsGDBKBKACDFO( + boolean containsGBHMAGADALJ( int key); /** - * Use {@link #getGDBKBKACDFOMap()} instead. + * Use {@link #getGBHMAGADALJMap()} instead. */ @java.lang.Deprecated java.util.Map - getGDBKBKACDFO(); + getGBHMAGADALJ(); /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ java.util.Map - getGDBKBKACDFOMap(); + getGBHMAGADALJMap(); /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ - int getGDBKBKACDFOOrDefault( + int getGBHMAGADALJOrDefault( int key, int defaultValue); /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ - int getGDBKBKACDFOOrThrow( + int getGBHMAGADALJOrThrow( int key); /** - * map<uint32, uint32> seen_ending_map = 3; + * uint32 id = 6; + * @return The id. */ - int getSeenEndingMapCount(); + int getId(); + /** - * map<uint32, uint32> seen_ending_map = 3; + * uint32 self_confidence = 9; + * @return The selfConfidence. */ - boolean containsSeenEndingMap( - int key); + int getSelfConfidence(); + /** - * Use {@link #getSeenEndingMapMap()} instead. + * repeated uint32 save_point_id_list = 11; + * @return A list containing the savePointIdList. */ - @java.lang.Deprecated - java.util.Map - getSeenEndingMap(); + java.util.List getSavePointIdListList(); /** - * map<uint32, uint32> seen_ending_map = 3; + * repeated uint32 save_point_id_list = 11; + * @return The count of savePointIdList. */ - java.util.Map - getSeenEndingMapMap(); + int getSavePointIdListCount(); /** - * map<uint32, uint32> seen_ending_map = 3; + * repeated uint32 save_point_id_list = 11; + * @param index The index of the element to return. + * @return The savePointIdList at the given index. */ + int getSavePointIdList(int index); - int getSeenEndingMapOrDefault( - int key, - int defaultValue); /** - * map<uint32, uint32> seen_ending_map = 3; + * .MainCoop.Status status = 14; + * @return The enum numeric value on the wire for status. */ - - int getSeenEndingMapOrThrow( - int key); + int getStatusValue(); + /** + * .MainCoop.Status status = 14; + * @return The status. + */ + emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status getStatus(); } /** * 
-   * Obf: CIGMGGBFGNB
+   * obf: BIIJLKKMPPI
    *
* * Protobuf type {@code MainCoop} @@ -177,8 +177,8 @@ private MainCoop(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private MainCoop() { - status_ = 0; savePointIdList_ = emptyIntList(); + status_ = 0; } @java.lang.Override @@ -212,17 +212,24 @@ private MainCoop( case 0: done = true; break; - case 8: { - int rawValue = input.readEnum(); - - status_ = rawValue; + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + eIAEIMKELEJ_ = com.google.protobuf.MapField.newMapField( + EIAEIMKELEJDefaultEntryHolder.defaultEntry); + mutable_bitField0_ |= 0x00000001; + } + com.google.protobuf.MapEntry + eIAEIMKELEJ__ = input.readMessage( + EIAEIMKELEJDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + eIAEIMKELEJ_.getMutableMap().put( + eIAEIMKELEJ__.getKey(), eIAEIMKELEJ__.getValue()); break; } - case 26: { - if (!((mutable_bitField0_ & 0x00000008) != 0)) { + case 18: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { seenEndingMap_ = com.google.protobuf.MapField.newMapField( SeenEndingMapDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000008; + mutable_bitField0_ |= 0x00000002; } com.google.protobuf.MapEntry seenEndingMap__ = input.readMessage( @@ -231,9 +238,17 @@ private MainCoop( seenEndingMap__.getKey(), seenEndingMap__.getValue()); break; } - case 40: { - - selfConfidence_ = input.readUInt32(); + case 34: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + gBHMAGADALJ_ = com.google.protobuf.MapField.newMapField( + GBHMAGADALJDefaultEntryHolder.defaultEntry); + mutable_bitField0_ |= 0x00000004; + } + com.google.protobuf.MapEntry + gBHMAGADALJ__ = input.readMessage( + GBHMAGADALJDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + gBHMAGADALJ_.getMutableMap().put( + gBHMAGADALJ__.getKey(), gBHMAGADALJ__.getValue()); break; } case 48: { @@ -241,33 +256,25 @@ private MainCoop( id_ = input.readUInt32(); break; } - case 66: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - gDBKBKACDFO_ = com.google.protobuf.MapField.newMapField( - GDBKBKACDFODefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000004; - } - com.google.protobuf.MapEntry - gDBKBKACDFO__ = input.readMessage( - GDBKBKACDFODefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - gDBKBKACDFO_.getMutableMap().put( - gDBKBKACDFO__.getKey(), gDBKBKACDFO__.getValue()); + case 72: { + + selfConfidence_ = input.readUInt32(); break; } - case 72: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { + case 88: { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { savePointIdList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000008; } savePointIdList_.addInt(input.readUInt32()); break; } - case 74: { + case 90: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) { savePointIdList_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000008; } while (input.getBytesUntilLimit() > 0) { savePointIdList_.addInt(input.readUInt32()); @@ -275,17 +282,10 @@ private MainCoop( input.popLimit(limit); break; } - case 98: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - gEHNFJEPCJL_ = com.google.protobuf.MapField.newMapField( - GEHNFJEPCJLDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000002; - } - com.google.protobuf.MapEntry - gEHNFJEPCJL__ = input.readMessage( - GEHNFJEPCJLDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - gEHNFJEPCJL_.getMutableMap().put( - gEHNFJEPCJL__.getKey(), gEHNFJEPCJL__.getValue()); + case 112: { + int rawValue = input.readEnum(); + + status_ = rawValue; break; } default: { @@ -303,7 +303,7 @@ private MainCoop( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { savePointIdList_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); @@ -320,12 +320,12 @@ private MainCoop( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 12: - return internalGetGEHNFJEPCJL(); - case 8: - return internalGetGDBKBKACDFO(); - case 3: + case 1: + return internalGetEIAEIMKELEJ(); + case 2: return internalGetSeenEndingMap(); + case 4: + return internalGetGBHMAGADALJ(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -341,7 +341,7 @@ protected com.google.protobuf.MapField internalGetMapField( /** * 
-     * Obf: HECGIMLHAJH
+     * obf: BKHKLFCBLFJ
      *
* * Protobuf enum {@code MainCoop.Status} @@ -460,367 +460,367 @@ private Status(int value) { // @@protoc_insertion_point(enum_scope:MainCoop.Status) } - public static final int SELF_CONFIDENCE_FIELD_NUMBER = 5; - private int selfConfidence_; - /** - * uint32 self_confidence = 5; - * @return The selfConfidence. - */ - @java.lang.Override - public int getSelfConfidence() { - return selfConfidence_; - } - - public static final int STATUS_FIELD_NUMBER = 1; - private int status_; - /** - * .MainCoop.Status status = 1; - * @return The enum numeric value on the wire for status. - */ - @java.lang.Override public int getStatusValue() { - return status_; - } - /** - * .MainCoop.Status status = 1; - * @return The status. - */ - @java.lang.Override public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status getStatus() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status result = emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.valueOf(status_); - return result == null ? emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.UNRECOGNIZED : result; - } - - public static final int SAVE_POINT_ID_LIST_FIELD_NUMBER = 9; - private com.google.protobuf.Internal.IntList savePointIdList_; - /** - * repeated uint32 save_point_id_list = 9; - * @return A list containing the savePointIdList. - */ - @java.lang.Override - public java.util.List - getSavePointIdListList() { - return savePointIdList_; - } - /** - * repeated uint32 save_point_id_list = 9; - * @return The count of savePointIdList. - */ - public int getSavePointIdListCount() { - return savePointIdList_.size(); - } - /** - * repeated uint32 save_point_id_list = 9; - * @param index The index of the element to return. - * @return The savePointIdList at the given index. - */ - public int getSavePointIdList(int index) { - return savePointIdList_.getInt(index); - } - private int savePointIdListMemoizedSerializedSize = -1; - - public static final int ID_FIELD_NUMBER = 6; - private int id_; - /** - * uint32 id = 6; - * @return The id. - */ - @java.lang.Override - public int getId() { - return id_; - } - - public static final int GEHNFJEPCJL_FIELD_NUMBER = 12; - private static final class GEHNFJEPCJLDefaultEntryHolder { + public static final int EIAEIMKELEJ_FIELD_NUMBER = 1; + private static final class EIAEIMKELEJDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - emu.grasscutter.net.proto.MainCoopOuterClass.internal_static_MainCoop_GEHNFJEPCJLEntry_descriptor, + emu.grasscutter.net.proto.MainCoopOuterClass.internal_static_MainCoop_EIAEIMKELEJEntry_descriptor, com.google.protobuf.WireFormat.FieldType.UINT32, 0, com.google.protobuf.WireFormat.FieldType.INT32, 0); } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> gEHNFJEPCJL_; + java.lang.Integer, java.lang.Integer> eIAEIMKELEJ_; private com.google.protobuf.MapField - internalGetGEHNFJEPCJL() { - if (gEHNFJEPCJL_ == null) { + internalGetEIAEIMKELEJ() { + if (eIAEIMKELEJ_ == null) { return com.google.protobuf.MapField.emptyMapField( - GEHNFJEPCJLDefaultEntryHolder.defaultEntry); + EIAEIMKELEJDefaultEntryHolder.defaultEntry); } - return gEHNFJEPCJL_; + return eIAEIMKELEJ_; } - public int getGEHNFJEPCJLCount() { - return internalGetGEHNFJEPCJL().getMap().size(); + public int getEIAEIMKELEJCount() { + return internalGetEIAEIMKELEJ().getMap().size(); } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, int32> EIAEIMKELEJ = 1; */ @java.lang.Override - public boolean containsGEHNFJEPCJL( + public boolean containsEIAEIMKELEJ( int key) { - return internalGetGEHNFJEPCJL().getMap().containsKey(key); + return internalGetEIAEIMKELEJ().getMap().containsKey(key); } /** - * Use {@link #getGEHNFJEPCJLMap()} instead. + * Use {@link #getEIAEIMKELEJMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getGEHNFJEPCJL() { - return getGEHNFJEPCJLMap(); + public java.util.Map getEIAEIMKELEJ() { + return getEIAEIMKELEJMap(); } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, int32> EIAEIMKELEJ = 1; */ @java.lang.Override - public java.util.Map getGEHNFJEPCJLMap() { - return internalGetGEHNFJEPCJL().getMap(); + public java.util.Map getEIAEIMKELEJMap() { + return internalGetEIAEIMKELEJ().getMap(); } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, int32> EIAEIMKELEJ = 1; */ @java.lang.Override - public int getGEHNFJEPCJLOrDefault( + public int getEIAEIMKELEJOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetGEHNFJEPCJL().getMap(); + internalGetEIAEIMKELEJ().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, int32> EIAEIMKELEJ = 1; */ @java.lang.Override - public int getGEHNFJEPCJLOrThrow( + public int getEIAEIMKELEJOrThrow( int key) { java.util.Map map = - internalGetGEHNFJEPCJL().getMap(); + internalGetEIAEIMKELEJ().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public static final int GDBKBKACDFO_FIELD_NUMBER = 8; - private static final class GDBKBKACDFODefaultEntryHolder { + public static final int SEEN_ENDING_MAP_FIELD_NUMBER = 2; + private static final class SeenEndingMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - emu.grasscutter.net.proto.MainCoopOuterClass.internal_static_MainCoop_GDBKBKACDFOEntry_descriptor, + emu.grasscutter.net.proto.MainCoopOuterClass.internal_static_MainCoop_SeenEndingMapEntry_descriptor, com.google.protobuf.WireFormat.FieldType.UINT32, 0, - com.google.protobuf.WireFormat.FieldType.INT32, + com.google.protobuf.WireFormat.FieldType.UINT32, 0); } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> gDBKBKACDFO_; + java.lang.Integer, java.lang.Integer> seenEndingMap_; private com.google.protobuf.MapField - internalGetGDBKBKACDFO() { - if (gDBKBKACDFO_ == null) { + internalGetSeenEndingMap() { + if (seenEndingMap_ == null) { return com.google.protobuf.MapField.emptyMapField( - GDBKBKACDFODefaultEntryHolder.defaultEntry); + SeenEndingMapDefaultEntryHolder.defaultEntry); } - return gDBKBKACDFO_; + return seenEndingMap_; } - public int getGDBKBKACDFOCount() { - return internalGetGDBKBKACDFO().getMap().size(); + public int getSeenEndingMapCount() { + return internalGetSeenEndingMap().getMap().size(); } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, uint32> seen_ending_map = 2; */ @java.lang.Override - public boolean containsGDBKBKACDFO( + public boolean containsSeenEndingMap( int key) { - return internalGetGDBKBKACDFO().getMap().containsKey(key); + return internalGetSeenEndingMap().getMap().containsKey(key); } /** - * Use {@link #getGDBKBKACDFOMap()} instead. + * Use {@link #getSeenEndingMapMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getGDBKBKACDFO() { - return getGDBKBKACDFOMap(); + public java.util.Map getSeenEndingMap() { + return getSeenEndingMapMap(); } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, uint32> seen_ending_map = 2; */ @java.lang.Override - public java.util.Map getGDBKBKACDFOMap() { - return internalGetGDBKBKACDFO().getMap(); + public java.util.Map getSeenEndingMapMap() { + return internalGetSeenEndingMap().getMap(); } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, uint32> seen_ending_map = 2; */ @java.lang.Override - public int getGDBKBKACDFOOrDefault( + public int getSeenEndingMapOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetGDBKBKACDFO().getMap(); + internalGetSeenEndingMap().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, uint32> seen_ending_map = 2; */ @java.lang.Override - public int getGDBKBKACDFOOrThrow( + public int getSeenEndingMapOrThrow( int key) { java.util.Map map = - internalGetGDBKBKACDFO().getMap(); + internalGetSeenEndingMap().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public static final int SEEN_ENDING_MAP_FIELD_NUMBER = 3; - private static final class SeenEndingMapDefaultEntryHolder { + public static final int GBHMAGADALJ_FIELD_NUMBER = 4; + private static final class GBHMAGADALJDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - emu.grasscutter.net.proto.MainCoopOuterClass.internal_static_MainCoop_SeenEndingMapEntry_descriptor, + emu.grasscutter.net.proto.MainCoopOuterClass.internal_static_MainCoop_GBHMAGADALJEntry_descriptor, com.google.protobuf.WireFormat.FieldType.UINT32, 0, - com.google.protobuf.WireFormat.FieldType.UINT32, + com.google.protobuf.WireFormat.FieldType.INT32, 0); } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> seenEndingMap_; + java.lang.Integer, java.lang.Integer> gBHMAGADALJ_; private com.google.protobuf.MapField - internalGetSeenEndingMap() { - if (seenEndingMap_ == null) { + internalGetGBHMAGADALJ() { + if (gBHMAGADALJ_ == null) { return com.google.protobuf.MapField.emptyMapField( - SeenEndingMapDefaultEntryHolder.defaultEntry); + GBHMAGADALJDefaultEntryHolder.defaultEntry); } - return seenEndingMap_; + return gBHMAGADALJ_; } - public int getSeenEndingMapCount() { - return internalGetSeenEndingMap().getMap().size(); + public int getGBHMAGADALJCount() { + return internalGetGBHMAGADALJ().getMap().size(); } /** - * map<uint32, uint32> seen_ending_map = 3; + * map<uint32, int32> GBHMAGADALJ = 4; */ @java.lang.Override - public boolean containsSeenEndingMap( + public boolean containsGBHMAGADALJ( int key) { - return internalGetSeenEndingMap().getMap().containsKey(key); + return internalGetGBHMAGADALJ().getMap().containsKey(key); } /** - * Use {@link #getSeenEndingMapMap()} instead. + * Use {@link #getGBHMAGADALJMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getSeenEndingMap() { - return getSeenEndingMapMap(); + public java.util.Map getGBHMAGADALJ() { + return getGBHMAGADALJMap(); } /** - * map<uint32, uint32> seen_ending_map = 3; + * map<uint32, int32> GBHMAGADALJ = 4; */ @java.lang.Override - public java.util.Map getSeenEndingMapMap() { - return internalGetSeenEndingMap().getMap(); + public java.util.Map getGBHMAGADALJMap() { + return internalGetGBHMAGADALJ().getMap(); } /** - * map<uint32, uint32> seen_ending_map = 3; + * map<uint32, int32> GBHMAGADALJ = 4; */ @java.lang.Override - public int getSeenEndingMapOrDefault( + public int getGBHMAGADALJOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetSeenEndingMap().getMap(); + internalGetGBHMAGADALJ().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> seen_ending_map = 3; + * map<uint32, int32> GBHMAGADALJ = 4; */ @java.lang.Override - public int getSeenEndingMapOrThrow( + public int getGBHMAGADALJOrThrow( int key) { java.util.Map map = - internalGetSeenEndingMap().getMap(); + internalGetGBHMAGADALJ().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - private byte memoizedIsInitialized = -1; + public static final int ID_FIELD_NUMBER = 6; + private int id_; + /** + * uint32 id = 6; + * @return The id. + */ @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; + public int getId() { + return id_; + } - memoizedIsInitialized = 1; - return true; + public static final int SELF_CONFIDENCE_FIELD_NUMBER = 9; + private int selfConfidence_; + /** + * uint32 self_confidence = 9; + * @return The selfConfidence. + */ + @java.lang.Override + public int getSelfConfidence() { + return selfConfidence_; } + public static final int SAVE_POINT_ID_LIST_FIELD_NUMBER = 11; + private com.google.protobuf.Internal.IntList savePointIdList_; + /** + * repeated uint32 save_point_id_list = 11; + * @return A list containing the savePointIdList. + */ @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (status_ != emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.INVALID.getNumber()) { - output.writeEnum(1, status_); - } - com.google.protobuf.GeneratedMessageV3 - .serializeIntegerMapTo( - output, - internalGetSeenEndingMap(), - SeenEndingMapDefaultEntryHolder.defaultEntry, - 3); - if (selfConfidence_ != 0) { - output.writeUInt32(5, selfConfidence_); - } - if (id_ != 0) { - output.writeUInt32(6, id_); - } + public java.util.List + getSavePointIdListList() { + return savePointIdList_; + } + /** + * repeated uint32 save_point_id_list = 11; + * @return The count of savePointIdList. + */ + public int getSavePointIdListCount() { + return savePointIdList_.size(); + } + /** + * repeated uint32 save_point_id_list = 11; + * @param index The index of the element to return. + * @return The savePointIdList at the given index. + */ + public int getSavePointIdList(int index) { + return savePointIdList_.getInt(index); + } + private int savePointIdListMemoizedSerializedSize = -1; + + public static final int STATUS_FIELD_NUMBER = 14; + private int status_; + /** + * .MainCoop.Status status = 14; + * @return The enum numeric value on the wire for status. + */ + @java.lang.Override public int getStatusValue() { + return status_; + } + /** + * .MainCoop.Status status = 14; + * @return The status. + */ + @java.lang.Override public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status getStatus() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status result = emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.valueOf(status_); + return result == null ? emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.UNRECOGNIZED : result; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + com.google.protobuf.GeneratedMessageV3 + .serializeIntegerMapTo( + output, + internalGetEIAEIMKELEJ(), + EIAEIMKELEJDefaultEntryHolder.defaultEntry, + 1); + com.google.protobuf.GeneratedMessageV3 + .serializeIntegerMapTo( + output, + internalGetSeenEndingMap(), + SeenEndingMapDefaultEntryHolder.defaultEntry, + 2); com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, - internalGetGDBKBKACDFO(), - GDBKBKACDFODefaultEntryHolder.defaultEntry, - 8); + internalGetGBHMAGADALJ(), + GBHMAGADALJDefaultEntryHolder.defaultEntry, + 4); + if (id_ != 0) { + output.writeUInt32(6, id_); + } + if (selfConfidence_ != 0) { + output.writeUInt32(9, selfConfidence_); + } if (getSavePointIdListList().size() > 0) { - output.writeUInt32NoTag(74); + output.writeUInt32NoTag(90); output.writeUInt32NoTag(savePointIdListMemoizedSerializedSize); } for (int i = 0; i < savePointIdList_.size(); i++) { output.writeUInt32NoTag(savePointIdList_.getInt(i)); } - com.google.protobuf.GeneratedMessageV3 - .serializeIntegerMapTo( - output, - internalGetGEHNFJEPCJL(), - GEHNFJEPCJLDefaultEntryHolder.defaultEntry, - 12); + if (status_ != emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.INVALID.getNumber()) { + output.writeEnum(14, status_); + } unknownFields.writeTo(output); } @@ -830,9 +830,15 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (status_ != emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.INVALID.getNumber()) { + for (java.util.Map.Entry entry + : internalGetEIAEIMKELEJ().getMap().entrySet()) { + com.google.protobuf.MapEntry + eIAEIMKELEJ__ = EIAEIMKELEJDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); size += com.google.protobuf.CodedOutputStream - .computeEnumSize(1, status_); + .computeMessageSize(1, eIAEIMKELEJ__); } for (java.util.Map.Entry entry : internalGetSeenEndingMap().getMap().entrySet()) { @@ -842,25 +848,25 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, seenEndingMap__); + .computeMessageSize(2, seenEndingMap__); } - if (selfConfidence_ != 0) { + for (java.util.Map.Entry entry + : internalGetGBHMAGADALJ().getMap().entrySet()) { + com.google.protobuf.MapEntry + gBHMAGADALJ__ = GBHMAGADALJDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, selfConfidence_); + .computeMessageSize(4, gBHMAGADALJ__); } if (id_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(6, id_); } - for (java.util.Map.Entry entry - : internalGetGDBKBKACDFO().getMap().entrySet()) { - com.google.protobuf.MapEntry - gDBKBKACDFO__ = GDBKBKACDFODefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + if (selfConfidence_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, gDBKBKACDFO__); + .computeUInt32Size(9, selfConfidence_); } { int dataSize = 0; @@ -876,15 +882,9 @@ public int getSerializedSize() { } savePointIdListMemoizedSerializedSize = dataSize; } - for (java.util.Map.Entry entry - : internalGetGEHNFJEPCJL().getMap().entrySet()) { - com.google.protobuf.MapEntry - gEHNFJEPCJL__ = GEHNFJEPCJLDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + if (status_ != emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.INVALID.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, gEHNFJEPCJL__); + .computeEnumSize(14, status_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -901,19 +901,19 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop other = (emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop) obj; + if (!internalGetEIAEIMKELEJ().equals( + other.internalGetEIAEIMKELEJ())) return false; + if (!internalGetSeenEndingMap().equals( + other.internalGetSeenEndingMap())) return false; + if (!internalGetGBHMAGADALJ().equals( + other.internalGetGBHMAGADALJ())) return false; + if (getId() + != other.getId()) return false; if (getSelfConfidence() != other.getSelfConfidence()) return false; - if (status_ != other.status_) return false; if (!getSavePointIdListList() .equals(other.getSavePointIdListList())) return false; - if (getId() - != other.getId()) return false; - if (!internalGetGEHNFJEPCJL().equals( - other.internalGetGEHNFJEPCJL())) return false; - if (!internalGetGDBKBKACDFO().equals( - other.internalGetGDBKBKACDFO())) return false; - if (!internalGetSeenEndingMap().equals( - other.internalGetSeenEndingMap())) return false; + if (status_ != other.status_) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -925,28 +925,28 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (!internalGetEIAEIMKELEJ().getMap().isEmpty()) { + hash = (37 * hash) + EIAEIMKELEJ_FIELD_NUMBER; + hash = (53 * hash) + internalGetEIAEIMKELEJ().hashCode(); + } + if (!internalGetSeenEndingMap().getMap().isEmpty()) { + hash = (37 * hash) + SEEN_ENDING_MAP_FIELD_NUMBER; + hash = (53 * hash) + internalGetSeenEndingMap().hashCode(); + } + if (!internalGetGBHMAGADALJ().getMap().isEmpty()) { + hash = (37 * hash) + GBHMAGADALJ_FIELD_NUMBER; + hash = (53 * hash) + internalGetGBHMAGADALJ().hashCode(); + } + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId(); hash = (37 * hash) + SELF_CONFIDENCE_FIELD_NUMBER; hash = (53 * hash) + getSelfConfidence(); - hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + status_; if (getSavePointIdListCount() > 0) { hash = (37 * hash) + SAVE_POINT_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getSavePointIdListList().hashCode(); } - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId(); - if (!internalGetGEHNFJEPCJL().getMap().isEmpty()) { - hash = (37 * hash) + GEHNFJEPCJL_FIELD_NUMBER; - hash = (53 * hash) + internalGetGEHNFJEPCJL().hashCode(); - } - if (!internalGetGDBKBKACDFO().getMap().isEmpty()) { - hash = (37 * hash) + GDBKBKACDFO_FIELD_NUMBER; - hash = (53 * hash) + internalGetGDBKBKACDFO().hashCode(); - } - if (!internalGetSeenEndingMap().getMap().isEmpty()) { - hash = (37 * hash) + SEEN_ENDING_MAP_FIELD_NUMBER; - hash = (53 * hash) + internalGetSeenEndingMap().hashCode(); - } + hash = (37 * hash) + STATUS_FIELD_NUMBER; + hash = (53 * hash) + status_; hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1044,7 +1044,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: CIGMGGBFGNB
+     * obf: BIIJLKKMPPI
      *
* * Protobuf type {@code MainCoop} @@ -1062,12 +1062,12 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 12: - return internalGetGEHNFJEPCJL(); - case 8: - return internalGetGDBKBKACDFO(); - case 3: + case 1: + return internalGetEIAEIMKELEJ(); + case 2: return internalGetSeenEndingMap(); + case 4: + return internalGetGBHMAGADALJ(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -1077,12 +1077,12 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 12: - return internalGetMutableGEHNFJEPCJL(); - case 8: - return internalGetMutableGDBKBKACDFO(); - case 3: + case 1: + return internalGetMutableEIAEIMKELEJ(); + case 2: return internalGetMutableSeenEndingMap(); + case 4: + return internalGetMutableGBHMAGADALJ(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -1114,17 +1114,17 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - selfConfidence_ = 0; + internalGetMutableEIAEIMKELEJ().clear(); + internalGetMutableSeenEndingMap().clear(); + internalGetMutableGBHMAGADALJ().clear(); + id_ = 0; - status_ = 0; + selfConfidence_ = 0; savePointIdList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - id_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + status_ = 0; - internalGetMutableGEHNFJEPCJL().clear(); - internalGetMutableGDBKBKACDFO().clear(); - internalGetMutableSeenEndingMap().clear(); return this; } @@ -1152,20 +1152,20 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop build() { public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop buildPartial() { emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop result = new emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop(this); int from_bitField0_ = bitField0_; + result.eIAEIMKELEJ_ = internalGetEIAEIMKELEJ(); + result.eIAEIMKELEJ_.makeImmutable(); + result.seenEndingMap_ = internalGetSeenEndingMap(); + result.seenEndingMap_.makeImmutable(); + result.gBHMAGADALJ_ = internalGetGBHMAGADALJ(); + result.gBHMAGADALJ_.makeImmutable(); + result.id_ = id_; result.selfConfidence_ = selfConfidence_; - result.status_ = status_; - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { savePointIdList_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } result.savePointIdList_ = savePointIdList_; - result.id_ = id_; - result.gEHNFJEPCJL_ = internalGetGEHNFJEPCJL(); - result.gEHNFJEPCJL_.makeImmutable(); - result.gDBKBKACDFO_ = internalGetGDBKBKACDFO(); - result.gDBKBKACDFO_.makeImmutable(); - result.seenEndingMap_ = internalGetSeenEndingMap(); - result.seenEndingMap_.makeImmutable(); + result.status_ = status_; onBuilt(); return result; } @@ -1214,31 +1214,31 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop other) { if (other == emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.getDefaultInstance()) return this; + internalGetMutableEIAEIMKELEJ().mergeFrom( + other.internalGetEIAEIMKELEJ()); + internalGetMutableSeenEndingMap().mergeFrom( + other.internalGetSeenEndingMap()); + internalGetMutableGBHMAGADALJ().mergeFrom( + other.internalGetGBHMAGADALJ()); + if (other.getId() != 0) { + setId(other.getId()); + } if (other.getSelfConfidence() != 0) { setSelfConfidence(other.getSelfConfidence()); } - if (other.status_ != 0) { - setStatusValue(other.getStatusValue()); - } if (!other.savePointIdList_.isEmpty()) { if (savePointIdList_.isEmpty()) { savePointIdList_ = other.savePointIdList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureSavePointIdListIsMutable(); savePointIdList_.addAll(other.savePointIdList_); } onChanged(); } - if (other.getId() != 0) { - setId(other.getId()); + if (other.status_ != 0) { + setStatusValue(other.getStatusValue()); } - internalGetMutableGEHNFJEPCJL().mergeFrom( - other.internalGetGEHNFJEPCJL()); - internalGetMutableGDBKBKACDFO().mergeFrom( - other.internalGetGDBKBKACDFO()); - internalGetMutableSeenEndingMap().mergeFrom( - other.internalGetSeenEndingMap()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1269,295 +1269,228 @@ public Builder mergeFrom( } private int bitField0_; - private int selfConfidence_ ; + private com.google.protobuf.MapField< + java.lang.Integer, java.lang.Integer> eIAEIMKELEJ_; + private com.google.protobuf.MapField + internalGetEIAEIMKELEJ() { + if (eIAEIMKELEJ_ == null) { + return com.google.protobuf.MapField.emptyMapField( + EIAEIMKELEJDefaultEntryHolder.defaultEntry); + } + return eIAEIMKELEJ_; + } + private com.google.protobuf.MapField + internalGetMutableEIAEIMKELEJ() { + onChanged();; + if (eIAEIMKELEJ_ == null) { + eIAEIMKELEJ_ = com.google.protobuf.MapField.newMapField( + EIAEIMKELEJDefaultEntryHolder.defaultEntry); + } + if (!eIAEIMKELEJ_.isMutable()) { + eIAEIMKELEJ_ = eIAEIMKELEJ_.copy(); + } + return eIAEIMKELEJ_; + } + + public int getEIAEIMKELEJCount() { + return internalGetEIAEIMKELEJ().getMap().size(); + } /** - * uint32 self_confidence = 5; - * @return The selfConfidence. + * map<uint32, int32> EIAEIMKELEJ = 1; */ + @java.lang.Override - public int getSelfConfidence() { - return selfConfidence_; + public boolean containsEIAEIMKELEJ( + int key) { + + return internalGetEIAEIMKELEJ().getMap().containsKey(key); } /** - * uint32 self_confidence = 5; - * @param value The selfConfidence to set. - * @return This builder for chaining. + * Use {@link #getEIAEIMKELEJMap()} instead. */ - public Builder setSelfConfidence(int value) { - - selfConfidence_ = value; - onChanged(); - return this; + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getEIAEIMKELEJ() { + return getEIAEIMKELEJMap(); } /** - * uint32 self_confidence = 5; - * @return This builder for chaining. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - public Builder clearSelfConfidence() { - - selfConfidence_ = 0; - onChanged(); - return this; + @java.lang.Override + + public java.util.Map getEIAEIMKELEJMap() { + return internalGetEIAEIMKELEJ().getMap(); } + /** + * map<uint32, int32> EIAEIMKELEJ = 1; + */ + @java.lang.Override - private int status_ = 0; + public int getEIAEIMKELEJOrDefault( + int key, + int defaultValue) { + + java.util.Map map = + internalGetEIAEIMKELEJ().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } /** - * .MainCoop.Status status = 1; - * @return The enum numeric value on the wire for status. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - @java.lang.Override public int getStatusValue() { - return status_; + @java.lang.Override + + public int getEIAEIMKELEJOrThrow( + int key) { + + java.util.Map map = + internalGetEIAEIMKELEJ().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearEIAEIMKELEJ() { + internalGetMutableEIAEIMKELEJ().getMutableMap() + .clear(); + return this; } /** - * .MainCoop.Status status = 1; - * @param value The enum numeric value on the wire for status to set. - * @return This builder for chaining. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - public Builder setStatusValue(int value) { + + public Builder removeEIAEIMKELEJ( + int key) { - status_ = value; - onChanged(); + internalGetMutableEIAEIMKELEJ().getMutableMap() + .remove(key); return this; } /** - * .MainCoop.Status status = 1; - * @return The status. + * Use alternate mutation accessors instead. */ - @java.lang.Override - public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status getStatus() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status result = emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.valueOf(status_); - return result == null ? emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.UNRECOGNIZED : result; + @java.lang.Deprecated + public java.util.Map + getMutableEIAEIMKELEJ() { + return internalGetMutableEIAEIMKELEJ().getMutableMap(); } /** - * .MainCoop.Status status = 1; - * @param value The status to set. - * @return This builder for chaining. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - public Builder setStatus(emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder putEIAEIMKELEJ( + int key, + int value) { - status_ = value.getNumber(); - onChanged(); + + internalGetMutableEIAEIMKELEJ().getMutableMap() + .put(key, value); return this; } /** - * .MainCoop.Status status = 1; - * @return This builder for chaining. + * map<uint32, int32> EIAEIMKELEJ = 1; */ - public Builder clearStatus() { - - status_ = 0; - onChanged(); - return this; - } - - private com.google.protobuf.Internal.IntList savePointIdList_ = emptyIntList(); - private void ensureSavePointIdListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - savePointIdList_ = mutableCopy(savePointIdList_); - bitField0_ |= 0x00000001; - } - } - /** - * repeated uint32 save_point_id_list = 9; - * @return A list containing the savePointIdList. - */ - public java.util.List - getSavePointIdListList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(savePointIdList_) : savePointIdList_; - } - /** - * repeated uint32 save_point_id_list = 9; - * @return The count of savePointIdList. - */ - public int getSavePointIdListCount() { - return savePointIdList_.size(); - } - /** - * repeated uint32 save_point_id_list = 9; - * @param index The index of the element to return. - * @return The savePointIdList at the given index. - */ - public int getSavePointIdList(int index) { - return savePointIdList_.getInt(index); - } - /** - * repeated uint32 save_point_id_list = 9; - * @param index The index to set the value at. - * @param value The savePointIdList to set. - * @return This builder for chaining. - */ - public Builder setSavePointIdList( - int index, int value) { - ensureSavePointIdListIsMutable(); - savePointIdList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 save_point_id_list = 9; - * @param value The savePointIdList to add. - * @return This builder for chaining. - */ - public Builder addSavePointIdList(int value) { - ensureSavePointIdListIsMutable(); - savePointIdList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 save_point_id_list = 9; - * @param values The savePointIdList to add. - * @return This builder for chaining. - */ - public Builder addAllSavePointIdList( - java.lang.Iterable values) { - ensureSavePointIdListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, savePointIdList_); - onChanged(); - return this; - } - /** - * repeated uint32 save_point_id_list = 9; - * @return This builder for chaining. - */ - public Builder clearSavePointIdList() { - savePointIdList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } - - private int id_ ; - /** - * uint32 id = 6; - * @return The id. - */ - @java.lang.Override - public int getId() { - return id_; - } - /** - * uint32 id = 6; - * @param value The id to set. - * @return This builder for chaining. - */ - public Builder setId(int value) { - - id_ = value; - onChanged(); - return this; - } - /** - * uint32 id = 6; - * @return This builder for chaining. - */ - public Builder clearId() { - - id_ = 0; - onChanged(); + + public Builder putAllEIAEIMKELEJ( + java.util.Map values) { + internalGetMutableEIAEIMKELEJ().getMutableMap() + .putAll(values); return this; } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> gEHNFJEPCJL_; + java.lang.Integer, java.lang.Integer> seenEndingMap_; private com.google.protobuf.MapField - internalGetGEHNFJEPCJL() { - if (gEHNFJEPCJL_ == null) { + internalGetSeenEndingMap() { + if (seenEndingMap_ == null) { return com.google.protobuf.MapField.emptyMapField( - GEHNFJEPCJLDefaultEntryHolder.defaultEntry); + SeenEndingMapDefaultEntryHolder.defaultEntry); } - return gEHNFJEPCJL_; + return seenEndingMap_; } private com.google.protobuf.MapField - internalGetMutableGEHNFJEPCJL() { + internalGetMutableSeenEndingMap() { onChanged();; - if (gEHNFJEPCJL_ == null) { - gEHNFJEPCJL_ = com.google.protobuf.MapField.newMapField( - GEHNFJEPCJLDefaultEntryHolder.defaultEntry); + if (seenEndingMap_ == null) { + seenEndingMap_ = com.google.protobuf.MapField.newMapField( + SeenEndingMapDefaultEntryHolder.defaultEntry); } - if (!gEHNFJEPCJL_.isMutable()) { - gEHNFJEPCJL_ = gEHNFJEPCJL_.copy(); + if (!seenEndingMap_.isMutable()) { + seenEndingMap_ = seenEndingMap_.copy(); } - return gEHNFJEPCJL_; + return seenEndingMap_; } - public int getGEHNFJEPCJLCount() { - return internalGetGEHNFJEPCJL().getMap().size(); + public int getSeenEndingMapCount() { + return internalGetSeenEndingMap().getMap().size(); } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ @java.lang.Override - public boolean containsGEHNFJEPCJL( + public boolean containsSeenEndingMap( int key) { - return internalGetGEHNFJEPCJL().getMap().containsKey(key); + return internalGetSeenEndingMap().getMap().containsKey(key); } /** - * Use {@link #getGEHNFJEPCJLMap()} instead. + * Use {@link #getSeenEndingMapMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getGEHNFJEPCJL() { - return getGEHNFJEPCJLMap(); + public java.util.Map getSeenEndingMap() { + return getSeenEndingMapMap(); } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ @java.lang.Override - public java.util.Map getGEHNFJEPCJLMap() { - return internalGetGEHNFJEPCJL().getMap(); + public java.util.Map getSeenEndingMapMap() { + return internalGetSeenEndingMap().getMap(); } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ @java.lang.Override - public int getGEHNFJEPCJLOrDefault( + public int getSeenEndingMapOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetGEHNFJEPCJL().getMap(); + internalGetSeenEndingMap().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ @java.lang.Override - public int getGEHNFJEPCJLOrThrow( + public int getSeenEndingMapOrThrow( int key) { java.util.Map map = - internalGetGEHNFJEPCJL().getMap(); + internalGetSeenEndingMap().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public Builder clearGEHNFJEPCJL() { - internalGetMutableGEHNFJEPCJL().getMutableMap() + public Builder clearSeenEndingMap() { + internalGetMutableSeenEndingMap().getMutableMap() .clear(); return this; } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ - public Builder removeGEHNFJEPCJL( + public Builder removeSeenEndingMap( int key) { - internalGetMutableGEHNFJEPCJL().getMutableMap() + internalGetMutableSeenEndingMap().getMutableMap() .remove(key); return this; } @@ -1566,126 +1499,126 @@ public Builder removeGEHNFJEPCJL( */ @java.lang.Deprecated public java.util.Map - getMutableGEHNFJEPCJL() { - return internalGetMutableGEHNFJEPCJL().getMutableMap(); + getMutableSeenEndingMap() { + return internalGetMutableSeenEndingMap().getMutableMap(); } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ - public Builder putGEHNFJEPCJL( + public Builder putSeenEndingMap( int key, int value) { - internalGetMutableGEHNFJEPCJL().getMutableMap() + internalGetMutableSeenEndingMap().getMutableMap() .put(key, value); return this; } /** - * map<uint32, int32> GEHNFJEPCJL = 12; + * map<uint32, uint32> seen_ending_map = 2; */ - public Builder putAllGEHNFJEPCJL( + public Builder putAllSeenEndingMap( java.util.Map values) { - internalGetMutableGEHNFJEPCJL().getMutableMap() + internalGetMutableSeenEndingMap().getMutableMap() .putAll(values); return this; } private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> gDBKBKACDFO_; + java.lang.Integer, java.lang.Integer> gBHMAGADALJ_; private com.google.protobuf.MapField - internalGetGDBKBKACDFO() { - if (gDBKBKACDFO_ == null) { + internalGetGBHMAGADALJ() { + if (gBHMAGADALJ_ == null) { return com.google.protobuf.MapField.emptyMapField( - GDBKBKACDFODefaultEntryHolder.defaultEntry); + GBHMAGADALJDefaultEntryHolder.defaultEntry); } - return gDBKBKACDFO_; + return gBHMAGADALJ_; } private com.google.protobuf.MapField - internalGetMutableGDBKBKACDFO() { + internalGetMutableGBHMAGADALJ() { onChanged();; - if (gDBKBKACDFO_ == null) { - gDBKBKACDFO_ = com.google.protobuf.MapField.newMapField( - GDBKBKACDFODefaultEntryHolder.defaultEntry); + if (gBHMAGADALJ_ == null) { + gBHMAGADALJ_ = com.google.protobuf.MapField.newMapField( + GBHMAGADALJDefaultEntryHolder.defaultEntry); } - if (!gDBKBKACDFO_.isMutable()) { - gDBKBKACDFO_ = gDBKBKACDFO_.copy(); + if (!gBHMAGADALJ_.isMutable()) { + gBHMAGADALJ_ = gBHMAGADALJ_.copy(); } - return gDBKBKACDFO_; + return gBHMAGADALJ_; } - public int getGDBKBKACDFOCount() { - return internalGetGDBKBKACDFO().getMap().size(); + public int getGBHMAGADALJCount() { + return internalGetGBHMAGADALJ().getMap().size(); } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ @java.lang.Override - public boolean containsGDBKBKACDFO( + public boolean containsGBHMAGADALJ( int key) { - return internalGetGDBKBKACDFO().getMap().containsKey(key); + return internalGetGBHMAGADALJ().getMap().containsKey(key); } /** - * Use {@link #getGDBKBKACDFOMap()} instead. + * Use {@link #getGBHMAGADALJMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getGDBKBKACDFO() { - return getGDBKBKACDFOMap(); + public java.util.Map getGBHMAGADALJ() { + return getGBHMAGADALJMap(); } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ @java.lang.Override - public java.util.Map getGDBKBKACDFOMap() { - return internalGetGDBKBKACDFO().getMap(); + public java.util.Map getGBHMAGADALJMap() { + return internalGetGBHMAGADALJ().getMap(); } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ @java.lang.Override - public int getGDBKBKACDFOOrDefault( + public int getGBHMAGADALJOrDefault( int key, int defaultValue) { java.util.Map map = - internalGetGDBKBKACDFO().getMap(); + internalGetGBHMAGADALJ().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ @java.lang.Override - public int getGDBKBKACDFOOrThrow( + public int getGBHMAGADALJOrThrow( int key) { java.util.Map map = - internalGetGDBKBKACDFO().getMap(); + internalGetGBHMAGADALJ().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public Builder clearGDBKBKACDFO() { - internalGetMutableGDBKBKACDFO().getMutableMap() + public Builder clearGBHMAGADALJ() { + internalGetMutableGBHMAGADALJ().getMutableMap() .clear(); return this; } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ - public Builder removeGDBKBKACDFO( + public Builder removeGBHMAGADALJ( int key) { - internalGetMutableGDBKBKACDFO().getMutableMap() + internalGetMutableGBHMAGADALJ().getMutableMap() .remove(key); return this; } @@ -1694,157 +1627,224 @@ public Builder removeGDBKBKACDFO( */ @java.lang.Deprecated public java.util.Map - getMutableGDBKBKACDFO() { - return internalGetMutableGDBKBKACDFO().getMutableMap(); + getMutableGBHMAGADALJ() { + return internalGetMutableGBHMAGADALJ().getMutableMap(); } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ - public Builder putGDBKBKACDFO( + public Builder putGBHMAGADALJ( int key, int value) { - internalGetMutableGDBKBKACDFO().getMutableMap() + internalGetMutableGBHMAGADALJ().getMutableMap() .put(key, value); return this; } /** - * map<uint32, int32> GDBKBKACDFO = 8; + * map<uint32, int32> GBHMAGADALJ = 4; */ - public Builder putAllGDBKBKACDFO( + public Builder putAllGBHMAGADALJ( java.util.Map values) { - internalGetMutableGDBKBKACDFO().getMutableMap() + internalGetMutableGBHMAGADALJ().getMutableMap() .putAll(values); return this; } - private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> seenEndingMap_; - private com.google.protobuf.MapField - internalGetSeenEndingMap() { - if (seenEndingMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - SeenEndingMapDefaultEntryHolder.defaultEntry); - } - return seenEndingMap_; - } - private com.google.protobuf.MapField - internalGetMutableSeenEndingMap() { - onChanged();; - if (seenEndingMap_ == null) { - seenEndingMap_ = com.google.protobuf.MapField.newMapField( - SeenEndingMapDefaultEntryHolder.defaultEntry); - } - if (!seenEndingMap_.isMutable()) { - seenEndingMap_ = seenEndingMap_.copy(); - } - return seenEndingMap_; - } - - public int getSeenEndingMapCount() { - return internalGetSeenEndingMap().getMap().size(); - } + private int id_ ; /** - * map<uint32, uint32> seen_ending_map = 3; + * uint32 id = 6; + * @return The id. */ - @java.lang.Override - public boolean containsSeenEndingMap( - int key) { + public int getId() { + return id_; + } + /** + * uint32 id = 6; + * @param value The id to set. + * @return This builder for chaining. + */ + public Builder setId(int value) { - return internalGetSeenEndingMap().getMap().containsKey(key); + id_ = value; + onChanged(); + return this; } /** - * Use {@link #getSeenEndingMapMap()} instead. + * uint32 id = 6; + * @return This builder for chaining. */ - @java.lang.Override - @java.lang.Deprecated - public java.util.Map getSeenEndingMap() { - return getSeenEndingMapMap(); + public Builder clearId() { + + id_ = 0; + onChanged(); + return this; } + + private int selfConfidence_ ; /** - * map<uint32, uint32> seen_ending_map = 3; + * uint32 self_confidence = 9; + * @return The selfConfidence. */ @java.lang.Override - - public java.util.Map getSeenEndingMapMap() { - return internalGetSeenEndingMap().getMap(); + public int getSelfConfidence() { + return selfConfidence_; } /** - * map<uint32, uint32> seen_ending_map = 3; + * uint32 self_confidence = 9; + * @param value The selfConfidence to set. + * @return This builder for chaining. */ - @java.lang.Override - - public int getSeenEndingMapOrDefault( - int key, - int defaultValue) { + public Builder setSelfConfidence(int value) { - java.util.Map map = - internalGetSeenEndingMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; + selfConfidence_ = value; + onChanged(); + return this; } /** - * map<uint32, uint32> seen_ending_map = 3; + * uint32 self_confidence = 9; + * @return This builder for chaining. */ - @java.lang.Override - - public int getSeenEndingMapOrThrow( - int key) { + public Builder clearSelfConfidence() { - java.util.Map map = - internalGetSeenEndingMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); + selfConfidence_ = 0; + onChanged(); + return this; } - public Builder clearSeenEndingMap() { - internalGetMutableSeenEndingMap().getMutableMap() - .clear(); + private com.google.protobuf.Internal.IntList savePointIdList_ = emptyIntList(); + private void ensureSavePointIdListIsMutable() { + if (!((bitField0_ & 0x00000008) != 0)) { + savePointIdList_ = mutableCopy(savePointIdList_); + bitField0_ |= 0x00000008; + } + } + /** + * repeated uint32 save_point_id_list = 11; + * @return A list containing the savePointIdList. + */ + public java.util.List + getSavePointIdListList() { + return ((bitField0_ & 0x00000008) != 0) ? + java.util.Collections.unmodifiableList(savePointIdList_) : savePointIdList_; + } + /** + * repeated uint32 save_point_id_list = 11; + * @return The count of savePointIdList. + */ + public int getSavePointIdListCount() { + return savePointIdList_.size(); + } + /** + * repeated uint32 save_point_id_list = 11; + * @param index The index of the element to return. + * @return The savePointIdList at the given index. + */ + public int getSavePointIdList(int index) { + return savePointIdList_.getInt(index); + } + /** + * repeated uint32 save_point_id_list = 11; + * @param index The index to set the value at. + * @param value The savePointIdList to set. + * @return This builder for chaining. + */ + public Builder setSavePointIdList( + int index, int value) { + ensureSavePointIdListIsMutable(); + savePointIdList_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 save_point_id_list = 11; + * @param value The savePointIdList to add. + * @return This builder for chaining. + */ + public Builder addSavePointIdList(int value) { + ensureSavePointIdListIsMutable(); + savePointIdList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 save_point_id_list = 11; + * @param values The savePointIdList to add. + * @return This builder for chaining. + */ + public Builder addAllSavePointIdList( + java.lang.Iterable values) { + ensureSavePointIdListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, savePointIdList_); + onChanged(); return this; } /** - * map<uint32, uint32> seen_ending_map = 3; + * repeated uint32 save_point_id_list = 11; + * @return This builder for chaining. */ + public Builder clearSavePointIdList() { + savePointIdList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + return this; + } - public Builder removeSeenEndingMap( - int key) { + private int status_ = 0; + /** + * .MainCoop.Status status = 14; + * @return The enum numeric value on the wire for status. + */ + @java.lang.Override public int getStatusValue() { + return status_; + } + /** + * .MainCoop.Status status = 14; + * @param value The enum numeric value on the wire for status to set. + * @return This builder for chaining. + */ + public Builder setStatusValue(int value) { - internalGetMutableSeenEndingMap().getMutableMap() - .remove(key); + status_ = value; + onChanged(); return this; } /** - * Use alternate mutation accessors instead. + * .MainCoop.Status status = 14; + * @return The status. */ - @java.lang.Deprecated - public java.util.Map - getMutableSeenEndingMap() { - return internalGetMutableSeenEndingMap().getMutableMap(); + @java.lang.Override + public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status getStatus() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status result = emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.valueOf(status_); + return result == null ? emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status.UNRECOGNIZED : result; } /** - * map<uint32, uint32> seen_ending_map = 3; + * .MainCoop.Status status = 14; + * @param value The status to set. + * @return This builder for chaining. */ - public Builder putSeenEndingMap( - int key, - int value) { - + public Builder setStatus(emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Status value) { + if (value == null) { + throw new NullPointerException(); + } - internalGetMutableSeenEndingMap().getMutableMap() - .put(key, value); + status_ = value.getNumber(); + onChanged(); return this; } /** - * map<uint32, uint32> seen_ending_map = 3; + * .MainCoop.Status status = 14; + * @return This builder for chaining. */ - - public Builder putAllSeenEndingMap( - java.util.Map values) { - internalGetMutableSeenEndingMap().getMutableMap() - .putAll(values); + public Builder clearStatus() { + + status_ = 0; + onChanged(); return this; } @java.lang.Override @@ -1906,20 +1906,20 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop getDefaultInstanceF com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_MainCoop_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_MainCoop_GEHNFJEPCJLEntry_descriptor; + internal_static_MainCoop_EIAEIMKELEJEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_MainCoop_GEHNFJEPCJLEntry_fieldAccessorTable; + internal_static_MainCoop_EIAEIMKELEJEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_MainCoop_GDBKBKACDFOEntry_descriptor; + internal_static_MainCoop_SeenEndingMapEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_MainCoop_GDBKBKACDFOEntry_fieldAccessorTable; + internal_static_MainCoop_SeenEndingMapEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_MainCoop_SeenEndingMapEntry_descriptor; + internal_static_MainCoop_GBHMAGADALJEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_MainCoop_SeenEndingMapEntry_fieldAccessorTable; + internal_static_MainCoop_GBHMAGADALJEntry_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1929,17 +1929,17 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop getDefaultInstanceF descriptor; static { java.lang.String[] descriptorData = { - "\n\016MainCoop.proto\"\326\003\n\010MainCoop\022\027\n\017self_co" + - "nfidence\030\005 \001(\r\022 \n\006status\030\001 \001(\0162\020.MainCoo" + - "p.Status\022\032\n\022save_point_id_list\030\t \003(\r\022\n\n\002" + - "id\030\006 \001(\r\022/\n\013GEHNFJEPCJL\030\014 \003(\0132\032.MainCoop" + - ".GEHNFJEPCJLEntry\022/\n\013GDBKBKACDFO\030\010 \003(\0132\032" + - ".MainCoop.GDBKBKACDFOEntry\0225\n\017seen_endin" + - "g_map\030\003 \003(\0132\034.MainCoop.SeenEndingMapEntr" + - "y\0322\n\020GEHNFJEPCJLEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005va" + - "lue\030\002 \001(\005:\0028\001\0322\n\020GDBKBKACDFOEntry\022\013\n\003key" + - "\030\001 \001(\r\022\r\n\005value\030\002 \001(\005:\0028\001\0324\n\022SeenEndingM" + - "apEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\"" + + "\n\016MainCoop.proto\"\326\003\n\010MainCoop\022/\n\013EIAEIMK" + + "ELEJ\030\001 \003(\0132\032.MainCoop.EIAEIMKELEJEntry\0225" + + "\n\017seen_ending_map\030\002 \003(\0132\034.MainCoop.SeenE" + + "ndingMapEntry\022/\n\013GBHMAGADALJ\030\004 \003(\0132\032.Mai" + + "nCoop.GBHMAGADALJEntry\022\n\n\002id\030\006 \001(\r\022\027\n\017se" + + "lf_confidence\030\t \001(\r\022\032\n\022save_point_id_lis" + + "t\030\013 \003(\r\022 \n\006status\030\016 \001(\0162\020.MainCoop.Statu" + + "s\0322\n\020EIAEIMKELEJEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005va" + + "lue\030\002 \001(\005:\0028\001\0324\n\022SeenEndingMapEntry\022\013\n\003k" + + "ey\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\0322\n\020GBHMAGADA" + + "LJEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\005:\0028\001\"" + "0\n\006Status\022\013\n\007INVALID\020\000\022\013\n\007RUNNING\020\001\022\014\n\010F" + "INISHED\020\002B\033\n\031emu.grasscutter.net.protob\006" + "proto3" @@ -1953,24 +1953,24 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop getDefaultInstanceF internal_static_MainCoop_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MainCoop_descriptor, - new java.lang.String[] { "SelfConfidence", "Status", "SavePointIdList", "Id", "GEHNFJEPCJL", "GDBKBKACDFO", "SeenEndingMap", }); - internal_static_MainCoop_GEHNFJEPCJLEntry_descriptor = + new java.lang.String[] { "EIAEIMKELEJ", "SeenEndingMap", "GBHMAGADALJ", "Id", "SelfConfidence", "SavePointIdList", "Status", }); + internal_static_MainCoop_EIAEIMKELEJEntry_descriptor = internal_static_MainCoop_descriptor.getNestedTypes().get(0); - internal_static_MainCoop_GEHNFJEPCJLEntry_fieldAccessorTable = new + internal_static_MainCoop_EIAEIMKELEJEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_MainCoop_GEHNFJEPCJLEntry_descriptor, + internal_static_MainCoop_EIAEIMKELEJEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - internal_static_MainCoop_GDBKBKACDFOEntry_descriptor = + internal_static_MainCoop_SeenEndingMapEntry_descriptor = internal_static_MainCoop_descriptor.getNestedTypes().get(1); - internal_static_MainCoop_GDBKBKACDFOEntry_fieldAccessorTable = new + internal_static_MainCoop_SeenEndingMapEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_MainCoop_GDBKBKACDFOEntry_descriptor, + internal_static_MainCoop_SeenEndingMapEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - internal_static_MainCoop_SeenEndingMapEntry_descriptor = + internal_static_MainCoop_GBHMAGADALJEntry_descriptor = internal_static_MainCoop_descriptor.getNestedTypes().get(2); - internal_static_MainCoop_SeenEndingMapEntry_fieldAccessorTable = new + internal_static_MainCoop_GBHMAGADALJEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_MainCoop_SeenEndingMapEntry_descriptor, + internal_static_MainCoop_GBHMAGADALJEntry_descriptor, new java.lang.String[] { "Key", "Value", }); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MassiveEntityElementOpBatchNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MassiveEntityElementOpBatchNotifyOuterClass.java index 2836b2b258e..1df1d08ac2b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MassiveEntityElementOpBatchNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MassiveEntityElementOpBatchNotifyOuterClass.java @@ -19,83 +19,83 @@ public interface MassiveEntityElementOpBatchNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 PIGDAOBDKBB = 7; - * @return The pIGDAOBDKBB. + * int32 entity_type = 2; + * @return The entityType. */ - int getPIGDAOBDKBB(); + int getEntityType(); /** - * uint32 op_idx = 4; + * uint32 op_idx = 8; * @return The opIdx. */ int getOpIdx(); /** - * uint32 user_id = 13; - * @return The userId. + * int32 KOANNGPCJBN = 9; + * @return The kOANNGPCJBN. */ - int getUserId(); + int getKOANNGPCJBN(); /** - * uint32 attacker_id = 1; + * uint32 attacker_id = 12; * @return The attackerId. */ int getAttackerId(); /** - * int32 entity_type = 10; - * @return The entityType. + * float attack_element_durability = 13; + * @return The attackElementDurability. */ - int getEntityType(); + float getAttackElementDurability(); /** - * int32 IOJOIDKOIBH = 9; - * @return The iOJOIDKOIBH. + * int32 MKGDPHCIMKL = 14; + * @return The mKGDPHCIMKL. */ - int getIOJOIDKOIBH(); + int getMKGDPHCIMKL(); /** - * .ShapeSphere shape_sphere = 12; + * uint32 user_id = 15; + * @return The userId. + */ + int getUserId(); + + /** + * .ShapeSphere shape_sphere = 5; * @return Whether the shapeSphere field is set. */ boolean hasShapeSphere(); /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; * @return The shapeSphere. */ emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere getShapeSphere(); /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphereOrBuilder getShapeSphereOrBuilder(); /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; * @return Whether the shapeBox field is set. */ boolean hasShapeBox(); /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; * @return The shapeBox. */ emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox getShapeBox(); /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBoxOrBuilder getShapeBoxOrBuilder(); - /** - * float attack_element_durability = 14; - * @return The attackElementDurability. - */ - float getAttackElementDurability(); - public emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.MassiveEntityElementOpBatchNotify.CheckShapeCase getCheckShapeCase(); } /** * 
-   * CmdId: 699
-   * Obf: FLIFJJHNFJO
+   * CmdId: 29700
+   * obf: KGAEJDGFHMJ
    *
* * Protobuf type {@code MassiveEntityElementOpBatchNotify} @@ -142,69 +142,69 @@ private MassiveEntityElementOpBatchNotify( case 0: done = true; break; - case 8: { - - attackerId_ = input.readUInt32(); - break; - } - case 32: { - - opIdx_ = input.readUInt32(); - break; - } - case 56: { - - pIGDAOBDKBB_ = input.readInt32(); - break; - } - case 72: { - - iOJOIDKOIBH_ = input.readInt32(); - break; - } - case 80: { + case 16: { entityType_ = input.readInt32(); break; } - case 90: { - emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.Builder subBuilder = null; - if (checkShapeCase_ == 11) { - subBuilder = ((emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_).toBuilder(); + case 42: { + emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.Builder subBuilder = null; + if (checkShapeCase_ == 5) { + subBuilder = ((emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_).toBuilder(); } checkShape_ = - input.readMessage(emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.parser(), extensionRegistry); + input.readMessage(emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom((emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_); + subBuilder.mergeFrom((emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_); checkShape_ = subBuilder.buildPartial(); } - checkShapeCase_ = 11; + checkShapeCase_ = 5; break; } - case 98: { - emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.Builder subBuilder = null; - if (checkShapeCase_ == 12) { - subBuilder = ((emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_).toBuilder(); + case 58: { + emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.Builder subBuilder = null; + if (checkShapeCase_ == 7) { + subBuilder = ((emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_).toBuilder(); } checkShape_ = - input.readMessage(emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.parser(), extensionRegistry); + input.readMessage(emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom((emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_); + subBuilder.mergeFrom((emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_); checkShape_ = subBuilder.buildPartial(); } - checkShapeCase_ = 12; + checkShapeCase_ = 7; break; } - case 104: { + case 64: { - userId_ = input.readUInt32(); + opIdx_ = input.readUInt32(); + break; + } + case 72: { + + kOANNGPCJBN_ = input.readInt32(); break; } - case 117: { + case 96: { + + attackerId_ = input.readUInt32(); + break; + } + case 109: { attackElementDurability_ = input.readFloat(); break; } + case 112: { + + mKGDPHCIMKL_ = input.readInt32(); + break; + } + case 120: { + + userId_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -242,8 +242,8 @@ private MassiveEntityElementOpBatchNotify( public enum CheckShapeCase implements com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { - SHAPE_SPHERE(12), - SHAPE_BOX(11), + SHAPE_SPHERE(5), + SHAPE_BOX(7), CHECKSHAPE_NOT_SET(0); private final int value; private CheckShapeCase(int value) { @@ -261,8 +261,8 @@ public static CheckShapeCase valueOf(int value) { public static CheckShapeCase forNumber(int value) { switch (value) { - case 12: return SHAPE_SPHERE; - case 11: return SHAPE_BOX; + case 5: return SHAPE_SPHERE; + case 7: return SHAPE_BOX; case 0: return CHECKSHAPE_NOT_SET; default: return null; } @@ -278,21 +278,21 @@ public int getNumber() { checkShapeCase_); } - public static final int PIGDAOBDKBB_FIELD_NUMBER = 7; - private int pIGDAOBDKBB_; + public static final int ENTITY_TYPE_FIELD_NUMBER = 2; + private int entityType_; /** - * int32 PIGDAOBDKBB = 7; - * @return The pIGDAOBDKBB. + * int32 entity_type = 2; + * @return The entityType. */ @java.lang.Override - public int getPIGDAOBDKBB() { - return pIGDAOBDKBB_; + public int getEntityType() { + return entityType_; } - public static final int OP_IDX_FIELD_NUMBER = 4; + public static final int OP_IDX_FIELD_NUMBER = 8; private int opIdx_; /** - * uint32 op_idx = 4; + * uint32 op_idx = 8; * @return The opIdx. */ @java.lang.Override @@ -300,21 +300,21 @@ public int getOpIdx() { return opIdx_; } - public static final int USER_ID_FIELD_NUMBER = 13; - private int userId_; + public static final int KOANNGPCJBN_FIELD_NUMBER = 9; + private int kOANNGPCJBN_; /** - * uint32 user_id = 13; - * @return The userId. + * int32 KOANNGPCJBN = 9; + * @return The kOANNGPCJBN. */ @java.lang.Override - public int getUserId() { - return userId_; + public int getKOANNGPCJBN() { + return kOANNGPCJBN_; } - public static final int ATTACKER_ID_FIELD_NUMBER = 1; + public static final int ATTACKER_ID_FIELD_NUMBER = 12; private int attackerId_; /** - * uint32 attacker_id = 1; + * uint32 attacker_id = 12; * @return The attackerId. */ @java.lang.Override @@ -322,101 +322,101 @@ public int getAttackerId() { return attackerId_; } - public static final int ENTITY_TYPE_FIELD_NUMBER = 10; - private int entityType_; + public static final int ATTACK_ELEMENT_DURABILITY_FIELD_NUMBER = 13; + private float attackElementDurability_; /** - * int32 entity_type = 10; - * @return The entityType. + * float attack_element_durability = 13; + * @return The attackElementDurability. */ @java.lang.Override - public int getEntityType() { - return entityType_; + public float getAttackElementDurability() { + return attackElementDurability_; + } + + public static final int MKGDPHCIMKL_FIELD_NUMBER = 14; + private int mKGDPHCIMKL_; + /** + * int32 MKGDPHCIMKL = 14; + * @return The mKGDPHCIMKL. + */ + @java.lang.Override + public int getMKGDPHCIMKL() { + return mKGDPHCIMKL_; } - public static final int IOJOIDKOIBH_FIELD_NUMBER = 9; - private int iOJOIDKOIBH_; + public static final int USER_ID_FIELD_NUMBER = 15; + private int userId_; /** - * int32 IOJOIDKOIBH = 9; - * @return The iOJOIDKOIBH. + * uint32 user_id = 15; + * @return The userId. */ @java.lang.Override - public int getIOJOIDKOIBH() { - return iOJOIDKOIBH_; + public int getUserId() { + return userId_; } - public static final int SHAPE_SPHERE_FIELD_NUMBER = 12; + public static final int SHAPE_SPHERE_FIELD_NUMBER = 5; /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; * @return Whether the shapeSphere field is set. */ @java.lang.Override public boolean hasShapeSphere() { - return checkShapeCase_ == 12; + return checkShapeCase_ == 5; } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; * @return The shapeSphere. */ @java.lang.Override public emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere getShapeSphere() { - if (checkShapeCase_ == 12) { + if (checkShapeCase_ == 5) { return (emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_; } return emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.getDefaultInstance(); } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ @java.lang.Override public emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphereOrBuilder getShapeSphereOrBuilder() { - if (checkShapeCase_ == 12) { + if (checkShapeCase_ == 5) { return (emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_; } return emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.getDefaultInstance(); } - public static final int SHAPE_BOX_FIELD_NUMBER = 11; + public static final int SHAPE_BOX_FIELD_NUMBER = 7; /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; * @return Whether the shapeBox field is set. */ @java.lang.Override public boolean hasShapeBox() { - return checkShapeCase_ == 11; + return checkShapeCase_ == 7; } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; * @return The shapeBox. */ @java.lang.Override public emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox getShapeBox() { - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { return (emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_; } return emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.getDefaultInstance(); } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ @java.lang.Override public emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBoxOrBuilder getShapeBoxOrBuilder() { - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { return (emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_; } return emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.getDefaultInstance(); } - public static final int ATTACK_ELEMENT_DURABILITY_FIELD_NUMBER = 14; - private float attackElementDurability_; - /** - * float attack_element_durability = 14; - * @return The attackElementDurability. - */ - @java.lang.Override - public float getAttackElementDurability() { - return attackElementDurability_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -431,32 +431,32 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (attackerId_ != 0) { - output.writeUInt32(1, attackerId_); + if (entityType_ != 0) { + output.writeInt32(2, entityType_); } - if (opIdx_ != 0) { - output.writeUInt32(4, opIdx_); + if (checkShapeCase_ == 5) { + output.writeMessage(5, (emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_); } - if (pIGDAOBDKBB_ != 0) { - output.writeInt32(7, pIGDAOBDKBB_); + if (checkShapeCase_ == 7) { + output.writeMessage(7, (emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_); } - if (iOJOIDKOIBH_ != 0) { - output.writeInt32(9, iOJOIDKOIBH_); + if (opIdx_ != 0) { + output.writeUInt32(8, opIdx_); } - if (entityType_ != 0) { - output.writeInt32(10, entityType_); + if (kOANNGPCJBN_ != 0) { + output.writeInt32(9, kOANNGPCJBN_); + } + if (attackerId_ != 0) { + output.writeUInt32(12, attackerId_); } - if (checkShapeCase_ == 11) { - output.writeMessage(11, (emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_); + if (attackElementDurability_ != 0F) { + output.writeFloat(13, attackElementDurability_); } - if (checkShapeCase_ == 12) { - output.writeMessage(12, (emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_); + if (mKGDPHCIMKL_ != 0) { + output.writeInt32(14, mKGDPHCIMKL_); } if (userId_ != 0) { - output.writeUInt32(13, userId_); - } - if (attackElementDurability_ != 0F) { - output.writeFloat(14, attackElementDurability_); + output.writeUInt32(15, userId_); } unknownFields.writeTo(output); } @@ -467,41 +467,41 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (attackerId_ != 0) { + if (entityType_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, attackerId_); + .computeInt32Size(2, entityType_); } - if (opIdx_ != 0) { + if (checkShapeCase_ == 5) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, opIdx_); + .computeMessageSize(5, (emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_); } - if (pIGDAOBDKBB_ != 0) { + if (checkShapeCase_ == 7) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(7, pIGDAOBDKBB_); + .computeMessageSize(7, (emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_); } - if (iOJOIDKOIBH_ != 0) { + if (opIdx_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, iOJOIDKOIBH_); + .computeUInt32Size(8, opIdx_); } - if (entityType_ != 0) { + if (kOANNGPCJBN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, entityType_); + .computeInt32Size(9, kOANNGPCJBN_); } - if (checkShapeCase_ == 11) { + if (attackerId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, (emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_); + .computeUInt32Size(12, attackerId_); } - if (checkShapeCase_ == 12) { + if (attackElementDurability_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, (emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_); + .computeFloatSize(13, attackElementDurability_); } - if (userId_ != 0) { + if (mKGDPHCIMKL_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, userId_); + .computeInt32Size(14, mKGDPHCIMKL_); } - if (attackElementDurability_ != 0F) { + if (userId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(14, attackElementDurability_); + .computeUInt32Size(15, userId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -518,28 +518,28 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.MassiveEntityElementOpBatchNotify other = (emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.MassiveEntityElementOpBatchNotify) obj; - if (getPIGDAOBDKBB() - != other.getPIGDAOBDKBB()) return false; + if (getEntityType() + != other.getEntityType()) return false; if (getOpIdx() != other.getOpIdx()) return false; - if (getUserId() - != other.getUserId()) return false; + if (getKOANNGPCJBN() + != other.getKOANNGPCJBN()) return false; if (getAttackerId() != other.getAttackerId()) return false; - if (getEntityType() - != other.getEntityType()) return false; - if (getIOJOIDKOIBH() - != other.getIOJOIDKOIBH()) return false; if (java.lang.Float.floatToIntBits(getAttackElementDurability()) != java.lang.Float.floatToIntBits( other.getAttackElementDurability())) return false; + if (getMKGDPHCIMKL() + != other.getMKGDPHCIMKL()) return false; + if (getUserId() + != other.getUserId()) return false; if (!getCheckShapeCase().equals(other.getCheckShapeCase())) return false; switch (checkShapeCase_) { - case 12: + case 5: if (!getShapeSphere() .equals(other.getShapeSphere())) return false; break; - case 11: + case 7: if (!getShapeBox() .equals(other.getShapeBox())) return false; break; @@ -557,27 +557,27 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + PIGDAOBDKBB_FIELD_NUMBER; - hash = (53 * hash) + getPIGDAOBDKBB(); + hash = (37 * hash) + ENTITY_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getEntityType(); hash = (37 * hash) + OP_IDX_FIELD_NUMBER; hash = (53 * hash) + getOpIdx(); - hash = (37 * hash) + USER_ID_FIELD_NUMBER; - hash = (53 * hash) + getUserId(); + hash = (37 * hash) + KOANNGPCJBN_FIELD_NUMBER; + hash = (53 * hash) + getKOANNGPCJBN(); hash = (37 * hash) + ATTACKER_ID_FIELD_NUMBER; hash = (53 * hash) + getAttackerId(); - hash = (37 * hash) + ENTITY_TYPE_FIELD_NUMBER; - hash = (53 * hash) + getEntityType(); - hash = (37 * hash) + IOJOIDKOIBH_FIELD_NUMBER; - hash = (53 * hash) + getIOJOIDKOIBH(); hash = (37 * hash) + ATTACK_ELEMENT_DURABILITY_FIELD_NUMBER; hash = (53 * hash) + java.lang.Float.floatToIntBits( getAttackElementDurability()); + hash = (37 * hash) + MKGDPHCIMKL_FIELD_NUMBER; + hash = (53 * hash) + getMKGDPHCIMKL(); + hash = (37 * hash) + USER_ID_FIELD_NUMBER; + hash = (53 * hash) + getUserId(); switch (checkShapeCase_) { - case 12: + case 5: hash = (37 * hash) + SHAPE_SPHERE_FIELD_NUMBER; hash = (53 * hash) + getShapeSphere().hashCode(); break; - case 11: + case 7: hash = (37 * hash) + SHAPE_BOX_FIELD_NUMBER; hash = (53 * hash) + getShapeBox().hashCode(); break; @@ -681,8 +681,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 699
-     * Obf: FLIFJJHNFJO
+     * CmdId: 29700
+     * obf: KGAEJDGFHMJ
      *
* * Protobuf type {@code MassiveEntityElementOpBatchNotify} @@ -722,19 +722,19 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - pIGDAOBDKBB_ = 0; + entityType_ = 0; opIdx_ = 0; - userId_ = 0; + kOANNGPCJBN_ = 0; attackerId_ = 0; - entityType_ = 0; + attackElementDurability_ = 0F; - iOJOIDKOIBH_ = 0; + mKGDPHCIMKL_ = 0; - attackElementDurability_ = 0F; + userId_ = 0; checkShapeCase_ = 0; checkShape_ = null; @@ -764,27 +764,27 @@ public emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.Mas @java.lang.Override public emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.MassiveEntityElementOpBatchNotify buildPartial() { emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.MassiveEntityElementOpBatchNotify result = new emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.MassiveEntityElementOpBatchNotify(this); - result.pIGDAOBDKBB_ = pIGDAOBDKBB_; + result.entityType_ = entityType_; result.opIdx_ = opIdx_; - result.userId_ = userId_; + result.kOANNGPCJBN_ = kOANNGPCJBN_; result.attackerId_ = attackerId_; - result.entityType_ = entityType_; - result.iOJOIDKOIBH_ = iOJOIDKOIBH_; - if (checkShapeCase_ == 12) { + result.attackElementDurability_ = attackElementDurability_; + result.mKGDPHCIMKL_ = mKGDPHCIMKL_; + result.userId_ = userId_; + if (checkShapeCase_ == 5) { if (shapeSphereBuilder_ == null) { result.checkShape_ = checkShape_; } else { result.checkShape_ = shapeSphereBuilder_.build(); } } - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { if (shapeBoxBuilder_ == null) { result.checkShape_ = checkShape_; } else { result.checkShape_ = shapeBoxBuilder_.build(); } } - result.attackElementDurability_ = attackElementDurability_; result.checkShapeCase_ = checkShapeCase_; onBuilt(); return result; @@ -834,27 +834,27 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.MassiveEntityElementOpBatchNotify other) { if (other == emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.MassiveEntityElementOpBatchNotify.getDefaultInstance()) return this; - if (other.getPIGDAOBDKBB() != 0) { - setPIGDAOBDKBB(other.getPIGDAOBDKBB()); + if (other.getEntityType() != 0) { + setEntityType(other.getEntityType()); } if (other.getOpIdx() != 0) { setOpIdx(other.getOpIdx()); } - if (other.getUserId() != 0) { - setUserId(other.getUserId()); + if (other.getKOANNGPCJBN() != 0) { + setKOANNGPCJBN(other.getKOANNGPCJBN()); } if (other.getAttackerId() != 0) { setAttackerId(other.getAttackerId()); } - if (other.getEntityType() != 0) { - setEntityType(other.getEntityType()); - } - if (other.getIOJOIDKOIBH() != 0) { - setIOJOIDKOIBH(other.getIOJOIDKOIBH()); - } if (other.getAttackElementDurability() != 0F) { setAttackElementDurability(other.getAttackElementDurability()); } + if (other.getMKGDPHCIMKL() != 0) { + setMKGDPHCIMKL(other.getMKGDPHCIMKL()); + } + if (other.getUserId() != 0) { + setUserId(other.getUserId()); + } switch (other.getCheckShapeCase()) { case SHAPE_SPHERE: { mergeShapeSphere(other.getShapeSphere()); @@ -912,40 +912,40 @@ public Builder clearCheckShape() { } - private int pIGDAOBDKBB_ ; + private int entityType_ ; /** - * int32 PIGDAOBDKBB = 7; - * @return The pIGDAOBDKBB. + * int32 entity_type = 2; + * @return The entityType. */ @java.lang.Override - public int getPIGDAOBDKBB() { - return pIGDAOBDKBB_; + public int getEntityType() { + return entityType_; } /** - * int32 PIGDAOBDKBB = 7; - * @param value The pIGDAOBDKBB to set. + * int32 entity_type = 2; + * @param value The entityType to set. * @return This builder for chaining. */ - public Builder setPIGDAOBDKBB(int value) { + public Builder setEntityType(int value) { - pIGDAOBDKBB_ = value; + entityType_ = value; onChanged(); return this; } /** - * int32 PIGDAOBDKBB = 7; + * int32 entity_type = 2; * @return This builder for chaining. */ - public Builder clearPIGDAOBDKBB() { + public Builder clearEntityType() { - pIGDAOBDKBB_ = 0; + entityType_ = 0; onChanged(); return this; } private int opIdx_ ; /** - * uint32 op_idx = 4; + * uint32 op_idx = 8; * @return The opIdx. */ @java.lang.Override @@ -953,7 +953,7 @@ public int getOpIdx() { return opIdx_; } /** - * uint32 op_idx = 4; + * uint32 op_idx = 8; * @param value The opIdx to set. * @return This builder for chaining. */ @@ -964,7 +964,7 @@ public Builder setOpIdx(int value) { return this; } /** - * uint32 op_idx = 4; + * uint32 op_idx = 8; * @return This builder for chaining. */ public Builder clearOpIdx() { @@ -974,40 +974,40 @@ public Builder clearOpIdx() { return this; } - private int userId_ ; + private int kOANNGPCJBN_ ; /** - * uint32 user_id = 13; - * @return The userId. + * int32 KOANNGPCJBN = 9; + * @return The kOANNGPCJBN. */ @java.lang.Override - public int getUserId() { - return userId_; + public int getKOANNGPCJBN() { + return kOANNGPCJBN_; } /** - * uint32 user_id = 13; - * @param value The userId to set. + * int32 KOANNGPCJBN = 9; + * @param value The kOANNGPCJBN to set. * @return This builder for chaining. */ - public Builder setUserId(int value) { + public Builder setKOANNGPCJBN(int value) { - userId_ = value; + kOANNGPCJBN_ = value; onChanged(); return this; } /** - * uint32 user_id = 13; + * int32 KOANNGPCJBN = 9; * @return This builder for chaining. */ - public Builder clearUserId() { + public Builder clearKOANNGPCJBN() { - userId_ = 0; + kOANNGPCJBN_ = 0; onChanged(); return this; } private int attackerId_ ; /** - * uint32 attacker_id = 1; + * uint32 attacker_id = 12; * @return The attackerId. */ @java.lang.Override @@ -1015,7 +1015,7 @@ public int getAttackerId() { return attackerId_; } /** - * uint32 attacker_id = 1; + * uint32 attacker_id = 12; * @param value The attackerId to set. * @return This builder for chaining. */ @@ -1026,7 +1026,7 @@ public Builder setAttackerId(int value) { return this; } /** - * uint32 attacker_id = 1; + * uint32 attacker_id = 12; * @return This builder for chaining. */ public Builder clearAttackerId() { @@ -1036,64 +1036,95 @@ public Builder clearAttackerId() { return this; } - private int entityType_ ; + private float attackElementDurability_ ; /** - * int32 entity_type = 10; - * @return The entityType. + * float attack_element_durability = 13; + * @return The attackElementDurability. */ @java.lang.Override - public int getEntityType() { - return entityType_; + public float getAttackElementDurability() { + return attackElementDurability_; } /** - * int32 entity_type = 10; - * @param value The entityType to set. + * float attack_element_durability = 13; + * @param value The attackElementDurability to set. * @return This builder for chaining. */ - public Builder setEntityType(int value) { + public Builder setAttackElementDurability(float value) { - entityType_ = value; + attackElementDurability_ = value; onChanged(); return this; } /** - * int32 entity_type = 10; + * float attack_element_durability = 13; * @return This builder for chaining. */ - public Builder clearEntityType() { + public Builder clearAttackElementDurability() { - entityType_ = 0; + attackElementDurability_ = 0F; onChanged(); return this; } - private int iOJOIDKOIBH_ ; + private int mKGDPHCIMKL_ ; /** - * int32 IOJOIDKOIBH = 9; - * @return The iOJOIDKOIBH. + * int32 MKGDPHCIMKL = 14; + * @return The mKGDPHCIMKL. */ @java.lang.Override - public int getIOJOIDKOIBH() { - return iOJOIDKOIBH_; + public int getMKGDPHCIMKL() { + return mKGDPHCIMKL_; } /** - * int32 IOJOIDKOIBH = 9; - * @param value The iOJOIDKOIBH to set. + * int32 MKGDPHCIMKL = 14; + * @param value The mKGDPHCIMKL to set. * @return This builder for chaining. */ - public Builder setIOJOIDKOIBH(int value) { + public Builder setMKGDPHCIMKL(int value) { - iOJOIDKOIBH_ = value; + mKGDPHCIMKL_ = value; onChanged(); return this; } /** - * int32 IOJOIDKOIBH = 9; + * int32 MKGDPHCIMKL = 14; * @return This builder for chaining. */ - public Builder clearIOJOIDKOIBH() { + public Builder clearMKGDPHCIMKL() { - iOJOIDKOIBH_ = 0; + mKGDPHCIMKL_ = 0; + onChanged(); + return this; + } + + private int userId_ ; + /** + * uint32 user_id = 15; + * @return The userId. + */ + @java.lang.Override + public int getUserId() { + return userId_; + } + /** + * uint32 user_id = 15; + * @param value The userId to set. + * @return This builder for chaining. + */ + public Builder setUserId(int value) { + + userId_ = value; + onChanged(); + return this; + } + /** + * uint32 user_id = 15; + * @return This builder for chaining. + */ + public Builder clearUserId() { + + userId_ = 0; onChanged(); return this; } @@ -1101,33 +1132,33 @@ public Builder clearIOJOIDKOIBH() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere, emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.Builder, emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphereOrBuilder> shapeSphereBuilder_; /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; * @return Whether the shapeSphere field is set. */ @java.lang.Override public boolean hasShapeSphere() { - return checkShapeCase_ == 12; + return checkShapeCase_ == 5; } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; * @return The shapeSphere. */ @java.lang.Override public emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere getShapeSphere() { if (shapeSphereBuilder_ == null) { - if (checkShapeCase_ == 12) { + if (checkShapeCase_ == 5) { return (emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_; } return emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.getDefaultInstance(); } else { - if (checkShapeCase_ == 12) { + if (checkShapeCase_ == 5) { return shapeSphereBuilder_.getMessage(); } return emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.getDefaultInstance(); } } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ public Builder setShapeSphere(emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere value) { if (shapeSphereBuilder_ == null) { @@ -1139,11 +1170,11 @@ public Builder setShapeSphere(emu.grasscutter.net.proto.ShapeSphereOuterClass.Sh } else { shapeSphereBuilder_.setMessage(value); } - checkShapeCase_ = 12; + checkShapeCase_ = 5; return this; } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ public Builder setShapeSphere( emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.Builder builderForValue) { @@ -1153,15 +1184,15 @@ public Builder setShapeSphere( } else { shapeSphereBuilder_.setMessage(builderForValue.build()); } - checkShapeCase_ = 12; + checkShapeCase_ = 5; return this; } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ public Builder mergeShapeSphere(emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere value) { if (shapeSphereBuilder_ == null) { - if (checkShapeCase_ == 12 && + if (checkShapeCase_ == 5 && checkShape_ != emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.getDefaultInstance()) { checkShape_ = emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.newBuilder((emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_) .mergeFrom(value).buildPartial(); @@ -1170,26 +1201,26 @@ public Builder mergeShapeSphere(emu.grasscutter.net.proto.ShapeSphereOuterClass. } onChanged(); } else { - if (checkShapeCase_ == 12) { + if (checkShapeCase_ == 5) { shapeSphereBuilder_.mergeFrom(value); } shapeSphereBuilder_.setMessage(value); } - checkShapeCase_ = 12; + checkShapeCase_ = 5; return this; } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ public Builder clearShapeSphere() { if (shapeSphereBuilder_ == null) { - if (checkShapeCase_ == 12) { + if (checkShapeCase_ == 5) { checkShapeCase_ = 0; checkShape_ = null; onChanged(); } } else { - if (checkShapeCase_ == 12) { + if (checkShapeCase_ == 5) { checkShapeCase_ = 0; checkShape_ = null; } @@ -1198,33 +1229,33 @@ public Builder clearShapeSphere() { return this; } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ public emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.Builder getShapeSphereBuilder() { return getShapeSphereFieldBuilder().getBuilder(); } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ @java.lang.Override public emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphereOrBuilder getShapeSphereOrBuilder() { - if ((checkShapeCase_ == 12) && (shapeSphereBuilder_ != null)) { + if ((checkShapeCase_ == 5) && (shapeSphereBuilder_ != null)) { return shapeSphereBuilder_.getMessageOrBuilder(); } else { - if (checkShapeCase_ == 12) { + if (checkShapeCase_ == 5) { return (emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere) checkShape_; } return emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.getDefaultInstance(); } } /** - * .ShapeSphere shape_sphere = 12; + * .ShapeSphere shape_sphere = 5; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere, emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.Builder, emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphereOrBuilder> getShapeSphereFieldBuilder() { if (shapeSphereBuilder_ == null) { - if (!(checkShapeCase_ == 12)) { + if (!(checkShapeCase_ == 5)) { checkShape_ = emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphere.getDefaultInstance(); } shapeSphereBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -1234,7 +1265,7 @@ public emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphereOrBuilder getS isClean()); checkShape_ = null; } - checkShapeCase_ = 12; + checkShapeCase_ = 5; onChanged();; return shapeSphereBuilder_; } @@ -1242,33 +1273,33 @@ public emu.grasscutter.net.proto.ShapeSphereOuterClass.ShapeSphereOrBuilder getS private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox, emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.Builder, emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBoxOrBuilder> shapeBoxBuilder_; /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; * @return Whether the shapeBox field is set. */ @java.lang.Override public boolean hasShapeBox() { - return checkShapeCase_ == 11; + return checkShapeCase_ == 7; } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; * @return The shapeBox. */ @java.lang.Override public emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox getShapeBox() { if (shapeBoxBuilder_ == null) { - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { return (emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_; } return emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.getDefaultInstance(); } else { - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { return shapeBoxBuilder_.getMessage(); } return emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.getDefaultInstance(); } } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ public Builder setShapeBox(emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox value) { if (shapeBoxBuilder_ == null) { @@ -1280,11 +1311,11 @@ public Builder setShapeBox(emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox } else { shapeBoxBuilder_.setMessage(value); } - checkShapeCase_ = 11; + checkShapeCase_ = 7; return this; } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ public Builder setShapeBox( emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.Builder builderForValue) { @@ -1294,15 +1325,15 @@ public Builder setShapeBox( } else { shapeBoxBuilder_.setMessage(builderForValue.build()); } - checkShapeCase_ = 11; + checkShapeCase_ = 7; return this; } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ public Builder mergeShapeBox(emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox value) { if (shapeBoxBuilder_ == null) { - if (checkShapeCase_ == 11 && + if (checkShapeCase_ == 7 && checkShape_ != emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.getDefaultInstance()) { checkShape_ = emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.newBuilder((emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_) .mergeFrom(value).buildPartial(); @@ -1311,26 +1342,26 @@ public Builder mergeShapeBox(emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeB } onChanged(); } else { - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { shapeBoxBuilder_.mergeFrom(value); } shapeBoxBuilder_.setMessage(value); } - checkShapeCase_ = 11; + checkShapeCase_ = 7; return this; } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ public Builder clearShapeBox() { if (shapeBoxBuilder_ == null) { - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { checkShapeCase_ = 0; checkShape_ = null; onChanged(); } } else { - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { checkShapeCase_ = 0; checkShape_ = null; } @@ -1339,33 +1370,33 @@ public Builder clearShapeBox() { return this; } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ public emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.Builder getShapeBoxBuilder() { return getShapeBoxFieldBuilder().getBuilder(); } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ @java.lang.Override public emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBoxOrBuilder getShapeBoxOrBuilder() { - if ((checkShapeCase_ == 11) && (shapeBoxBuilder_ != null)) { + if ((checkShapeCase_ == 7) && (shapeBoxBuilder_ != null)) { return shapeBoxBuilder_.getMessageOrBuilder(); } else { - if (checkShapeCase_ == 11) { + if (checkShapeCase_ == 7) { return (emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox) checkShape_; } return emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.getDefaultInstance(); } } /** - * .ShapeBox shape_box = 11; + * .ShapeBox shape_box = 7; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox, emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.Builder, emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBoxOrBuilder> getShapeBoxFieldBuilder() { if (shapeBoxBuilder_ == null) { - if (!(checkShapeCase_ == 11)) { + if (!(checkShapeCase_ == 7)) { checkShape_ = emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBox.getDefaultInstance(); } shapeBoxBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< @@ -1375,41 +1406,10 @@ public emu.grasscutter.net.proto.ShapeBoxOuterClass.ShapeBoxOrBuilder getShapeBo isClean()); checkShape_ = null; } - checkShapeCase_ = 11; + checkShapeCase_ = 7; onChanged();; return shapeBoxBuilder_; } - - private float attackElementDurability_ ; - /** - * float attack_element_durability = 14; - * @return The attackElementDurability. - */ - @java.lang.Override - public float getAttackElementDurability() { - return attackElementDurability_; - } - /** - * float attack_element_durability = 14; - * @param value The attackElementDurability to set. - * @return This builder for chaining. - */ - public Builder setAttackElementDurability(float value) { - - attackElementDurability_ = value; - onChanged(); - return this; - } - /** - * float attack_element_durability = 14; - * @return This builder for chaining. - */ - public Builder clearAttackElementDurability() { - - attackElementDurability_ = 0F; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1479,13 +1479,13 @@ public emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.Mas java.lang.String[] descriptorData = { "\n\'MassiveEntityElementOpBatchNotify.prot" + "o\032\021ShapeSphere.proto\032\016ShapeBox.proto\"\220\002\n" + - "!MassiveEntityElementOpBatchNotify\022\023\n\013PI" + - "GDAOBDKBB\030\007 \001(\005\022\016\n\006op_idx\030\004 \001(\r\022\017\n\007user_" + - "id\030\r \001(\r\022\023\n\013attacker_id\030\001 \001(\r\022\023\n\013entity_" + - "type\030\n \001(\005\022\023\n\013IOJOIDKOIBH\030\t \001(\005\022$\n\014shape" + - "_sphere\030\014 \001(\0132\014.ShapeSphereH\000\022\036\n\tshape_b" + - "ox\030\013 \001(\0132\t.ShapeBoxH\000\022!\n\031attack_element_" + - "durability\030\016 \001(\002B\r\n\013check_shapeB\033\n\031emu.g" + + "!MassiveEntityElementOpBatchNotify\022\023\n\013en" + + "tity_type\030\002 \001(\005\022\016\n\006op_idx\030\010 \001(\r\022\023\n\013KOANN" + + "GPCJBN\030\t \001(\005\022\023\n\013attacker_id\030\014 \001(\r\022!\n\031att" + + "ack_element_durability\030\r \001(\002\022\023\n\013MKGDPHCI" + + "MKL\030\016 \001(\005\022\017\n\007user_id\030\017 \001(\r\022$\n\014shape_sphe" + + "re\030\005 \001(\0132\014.ShapeSphereH\000\022\036\n\tshape_box\030\007 " + + "\001(\0132\t.ShapeBoxH\000B\r\n\013check_shapeB\033\n\031emu.g" + "rasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1499,7 +1499,7 @@ public emu.grasscutter.net.proto.MassiveEntityElementOpBatchNotifyOuterClass.Mas internal_static_MassiveEntityElementOpBatchNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MassiveEntityElementOpBatchNotify_descriptor, - new java.lang.String[] { "PIGDAOBDKBB", "OpIdx", "UserId", "AttackerId", "EntityType", "IOJOIDKOIBH", "ShapeSphere", "ShapeBox", "AttackElementDurability", "CheckShape", }); + new java.lang.String[] { "EntityType", "OpIdx", "KOANNGPCJBN", "AttackerId", "AttackElementDurability", "MKGDPHCIMKL", "UserId", "ShapeSphere", "ShapeBox", "CheckShape", }); emu.grasscutter.net.proto.ShapeSphereOuterClass.getDescriptor(); emu.grasscutter.net.proto.ShapeBoxOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MaterialInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MaterialInfoOuterClass.java index eca01f5d4fd..1d40ee24720 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MaterialInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MaterialInfoOuterClass.java @@ -25,14 +25,14 @@ public interface MaterialInfoOrBuilder extends long getGuid(); /** - * uint32 count = 4; + * uint32 count = 9; * @return The count. */ int getCount(); } /** * 
-   * Obf: MGMDCJEEMPF
+   * obf: FGBAEINDLHG
    *
* * Protobuf type {@code MaterialInfo} @@ -79,14 +79,14 @@ private MaterialInfo( case 0: done = true; break; - case 32: { + case 48: { - count_ = input.readUInt32(); + guid_ = input.readUInt64(); break; } - case 48: { + case 72: { - guid_ = input.readUInt64(); + count_ = input.readUInt32(); break; } default: { @@ -132,10 +132,10 @@ public long getGuid() { return guid_; } - public static final int COUNT_FIELD_NUMBER = 4; + public static final int COUNT_FIELD_NUMBER = 9; private int count_; /** - * uint32 count = 4; + * uint32 count = 9; * @return The count. */ @java.lang.Override @@ -157,12 +157,12 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (count_ != 0) { - output.writeUInt32(4, count_); - } if (guid_ != 0L) { output.writeUInt64(6, guid_); } + if (count_ != 0) { + output.writeUInt32(9, count_); + } unknownFields.writeTo(output); } @@ -172,14 +172,14 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (count_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, count_); - } if (guid_ != 0L) { size += com.google.protobuf.CodedOutputStream .computeUInt64Size(6, guid_); } + if (count_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(9, count_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -312,7 +312,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: MGMDCJEEMPF
+     * obf: FGBAEINDLHG
      *
* * Protobuf type {@code MaterialInfo} @@ -500,7 +500,7 @@ public Builder clearGuid() { private int count_ ; /** - * uint32 count = 4; + * uint32 count = 9; * @return The count. */ @java.lang.Override @@ -508,7 +508,7 @@ public int getCount() { return count_; } /** - * uint32 count = 4; + * uint32 count = 9; * @param value The count to set. * @return This builder for chaining. */ @@ -519,7 +519,7 @@ public Builder setCount(int value) { return this; } /** - * uint32 count = 4; + * uint32 count = 9; * @return This builder for chaining. */ public Builder clearCount() { @@ -596,7 +596,7 @@ public emu.grasscutter.net.proto.MaterialInfoOuterClass.MaterialInfo getDefaultI static { java.lang.String[] descriptorData = { "\n\022MaterialInfo.proto\"+\n\014MaterialInfo\022\014\n\004" + - "guid\030\006 \001(\004\022\r\n\005count\030\004 \001(\rB\033\n\031emu.grasscu" + + "guid\030\006 \001(\004\022\r\n\005count\030\t \001(\rB\033\n\031emu.grasscu" + "tter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/McoinExchangeHcoinReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/McoinExchangeHcoinReqOuterClass.java index fd8580d2eb0..d07d1175ef5 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/McoinExchangeHcoinReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/McoinExchangeHcoinReqOuterClass.java @@ -19,21 +19,21 @@ public interface McoinExchangeHcoinReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 mcoin_cost = 13; + * uint32 mcoin_cost = 10; * @return The mcoinCost. */ int getMcoinCost(); /** - * uint32 hcoin = 8; + * uint32 hcoin = 12; * @return The hcoin. */ int getHcoin(); } /** * 
-   * CmdId: 29611
-   * Obf: OJDOCOAMKPC
+   * CmdId: 5528
+   * obf: KCBPHNMBEHJ
    *
* * Protobuf type {@code McoinExchangeHcoinReq} @@ -80,14 +80,14 @@ private McoinExchangeHcoinReq( case 0: done = true; break; - case 64: { + case 80: { - hcoin_ = input.readUInt32(); + mcoinCost_ = input.readUInt32(); break; } - case 104: { + case 96: { - mcoinCost_ = input.readUInt32(); + hcoin_ = input.readUInt32(); break; } default: { @@ -122,10 +122,10 @@ private McoinExchangeHcoinReq( emu.grasscutter.net.proto.McoinExchangeHcoinReqOuterClass.McoinExchangeHcoinReq.class, emu.grasscutter.net.proto.McoinExchangeHcoinReqOuterClass.McoinExchangeHcoinReq.Builder.class); } - public static final int MCOIN_COST_FIELD_NUMBER = 13; + public static final int MCOIN_COST_FIELD_NUMBER = 10; private int mcoinCost_; /** - * uint32 mcoin_cost = 13; + * uint32 mcoin_cost = 10; * @return The mcoinCost. */ @java.lang.Override @@ -133,10 +133,10 @@ public int getMcoinCost() { return mcoinCost_; } - public static final int HCOIN_FIELD_NUMBER = 8; + public static final int HCOIN_FIELD_NUMBER = 12; private int hcoin_; /** - * uint32 hcoin = 8; + * uint32 hcoin = 12; * @return The hcoin. */ @java.lang.Override @@ -158,11 +158,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (hcoin_ != 0) { - output.writeUInt32(8, hcoin_); - } if (mcoinCost_ != 0) { - output.writeUInt32(13, mcoinCost_); + output.writeUInt32(10, mcoinCost_); + } + if (hcoin_ != 0) { + output.writeUInt32(12, hcoin_); } unknownFields.writeTo(output); } @@ -173,13 +173,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (hcoin_ != 0) { + if (mcoinCost_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, hcoin_); + .computeUInt32Size(10, mcoinCost_); } - if (mcoinCost_ != 0) { + if (hcoin_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, mcoinCost_); + .computeUInt32Size(12, hcoin_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -312,8 +312,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29611
-     * Obf: OJDOCOAMKPC
+     * CmdId: 5528
+     * obf: KCBPHNMBEHJ
      *
* * Protobuf type {@code McoinExchangeHcoinReq} @@ -470,7 +470,7 @@ public Builder mergeFrom( private int mcoinCost_ ; /** - * uint32 mcoin_cost = 13; + * uint32 mcoin_cost = 10; * @return The mcoinCost. */ @java.lang.Override @@ -478,7 +478,7 @@ public int getMcoinCost() { return mcoinCost_; } /** - * uint32 mcoin_cost = 13; + * uint32 mcoin_cost = 10; * @param value The mcoinCost to set. * @return This builder for chaining. */ @@ -489,7 +489,7 @@ public Builder setMcoinCost(int value) { return this; } /** - * uint32 mcoin_cost = 13; + * uint32 mcoin_cost = 10; * @return This builder for chaining. */ public Builder clearMcoinCost() { @@ -501,7 +501,7 @@ public Builder clearMcoinCost() { private int hcoin_ ; /** - * uint32 hcoin = 8; + * uint32 hcoin = 12; * @return The hcoin. */ @java.lang.Override @@ -509,7 +509,7 @@ public int getHcoin() { return hcoin_; } /** - * uint32 hcoin = 8; + * uint32 hcoin = 12; * @param value The hcoin to set. * @return This builder for chaining. */ @@ -520,7 +520,7 @@ public Builder setHcoin(int value) { return this; } /** - * uint32 hcoin = 8; + * uint32 hcoin = 12; * @return This builder for chaining. */ public Builder clearHcoin() { @@ -597,8 +597,8 @@ public emu.grasscutter.net.proto.McoinExchangeHcoinReqOuterClass.McoinExchangeHc static { java.lang.String[] descriptorData = { "\n\033McoinExchangeHcoinReq.proto\":\n\025McoinEx" + - "changeHcoinReq\022\022\n\nmcoin_cost\030\r \001(\r\022\r\n\005hc" + - "oin\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006" + + "changeHcoinReq\022\022\n\nmcoin_cost\030\n \001(\r\022\r\n\005hc" + + "oin\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006" + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/McoinExchangeHcoinRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/McoinExchangeHcoinRspOuterClass.java index 440cac24e02..631343a105d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/McoinExchangeHcoinRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/McoinExchangeHcoinRspOuterClass.java @@ -19,27 +19,27 @@ public interface McoinExchangeHcoinRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 hcoin = 11; - * @return The hcoin. - */ - int getHcoin(); - - /** - * int32 retcode = 5; + * int32 retcode = 8; * @return The retcode. */ int getRetcode(); /** - * uint32 mcoin_cost = 1; + * uint32 mcoin_cost = 13; * @return The mcoinCost. */ int getMcoinCost(); + + /** + * uint32 hcoin = 15; + * @return The hcoin. + */ + int getHcoin(); } /** * 
-   * CmdId: 21323
-   * Obf: OEBFOFIJHGC
+   * CmdId: 21052
+   * obf: MKHFFDGLODJ
    *
* * Protobuf type {@code McoinExchangeHcoinRsp} @@ -86,17 +86,17 @@ private McoinExchangeHcoinRsp( case 0: done = true; break; - case 8: { + case 64: { - mcoinCost_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 40: { + case 104: { - retcode_ = input.readInt32(); + mcoinCost_ = input.readUInt32(); break; } - case 88: { + case 120: { hcoin_ = input.readUInt32(); break; @@ -133,21 +133,10 @@ private McoinExchangeHcoinRsp( emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp.class, emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp.Builder.class); } - public static final int HCOIN_FIELD_NUMBER = 11; - private int hcoin_; - /** - * uint32 hcoin = 11; - * @return The hcoin. - */ - @java.lang.Override - public int getHcoin() { - return hcoin_; - } - - public static final int RETCODE_FIELD_NUMBER = 5; + public static final int RETCODE_FIELD_NUMBER = 8; private int retcode_; /** - * int32 retcode = 5; + * int32 retcode = 8; * @return The retcode. */ @java.lang.Override @@ -155,10 +144,10 @@ public int getRetcode() { return retcode_; } - public static final int MCOIN_COST_FIELD_NUMBER = 1; + public static final int MCOIN_COST_FIELD_NUMBER = 13; private int mcoinCost_; /** - * uint32 mcoin_cost = 1; + * uint32 mcoin_cost = 13; * @return The mcoinCost. */ @java.lang.Override @@ -166,6 +155,17 @@ public int getMcoinCost() { return mcoinCost_; } + public static final int HCOIN_FIELD_NUMBER = 15; + private int hcoin_; + /** + * uint32 hcoin = 15; + * @return The hcoin. + */ + @java.lang.Override + public int getHcoin() { + return hcoin_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (mcoinCost_ != 0) { - output.writeUInt32(1, mcoinCost_); - } if (retcode_ != 0) { - output.writeInt32(5, retcode_); + output.writeInt32(8, retcode_); + } + if (mcoinCost_ != 0) { + output.writeUInt32(13, mcoinCost_); } if (hcoin_ != 0) { - output.writeUInt32(11, hcoin_); + output.writeUInt32(15, hcoin_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (mcoinCost_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, mcoinCost_); + .computeInt32Size(8, retcode_); } - if (retcode_ != 0) { + if (mcoinCost_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, retcode_); + .computeUInt32Size(13, mcoinCost_); } if (hcoin_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, hcoin_); + .computeUInt32Size(15, hcoin_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +225,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp other = (emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp) obj; - if (getHcoin() - != other.getHcoin()) return false; if (getRetcode() != other.getRetcode()) return false; if (getMcoinCost() != other.getMcoinCost()) return false; + if (getHcoin() + != other.getHcoin()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +242,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + HCOIN_FIELD_NUMBER; - hash = (53 * hash) + getHcoin(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (37 * hash) + MCOIN_COST_FIELD_NUMBER; hash = (53 * hash) + getMcoinCost(); + hash = (37 * hash) + HCOIN_FIELD_NUMBER; + hash = (53 * hash) + getHcoin(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 21323
-     * Obf: OEBFOFIJHGC
+     * CmdId: 21052
+     * obf: MKHFFDGLODJ
      *
* * Protobuf type {@code McoinExchangeHcoinRsp} @@ -386,12 +386,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - hcoin_ = 0; - retcode_ = 0; mcoinCost_ = 0; + hcoin_ = 0; + return this; } @@ -418,9 +418,9 @@ public emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHc @java.lang.Override public emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp buildPartial() { emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp result = new emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp(this); - result.hcoin_ = hcoin_; result.retcode_ = retcode_; result.mcoinCost_ = mcoinCost_; + result.hcoin_ = hcoin_; onBuilt(); return result; } @@ -469,15 +469,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp other) { if (other == emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHcoinRsp.getDefaultInstance()) return this; - if (other.getHcoin() != 0) { - setHcoin(other.getHcoin()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } if (other.getMcoinCost() != 0) { setMcoinCost(other.getMcoinCost()); } + if (other.getHcoin() != 0) { + setHcoin(other.getHcoin()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -507,95 +507,95 @@ public Builder mergeFrom( return this; } - private int hcoin_ ; + private int retcode_ ; /** - * uint32 hcoin = 11; - * @return The hcoin. + * int32 retcode = 8; + * @return The retcode. */ @java.lang.Override - public int getHcoin() { - return hcoin_; + public int getRetcode() { + return retcode_; } /** - * uint32 hcoin = 11; - * @param value The hcoin to set. + * int32 retcode = 8; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setHcoin(int value) { + public Builder setRetcode(int value) { - hcoin_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 hcoin = 11; + * int32 retcode = 8; * @return This builder for chaining. */ - public Builder clearHcoin() { + public Builder clearRetcode() { - hcoin_ = 0; + retcode_ = 0; onChanged(); return this; } - private int retcode_ ; + private int mcoinCost_ ; /** - * int32 retcode = 5; - * @return The retcode. + * uint32 mcoin_cost = 13; + * @return The mcoinCost. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getMcoinCost() { + return mcoinCost_; } /** - * int32 retcode = 5; - * @param value The retcode to set. + * uint32 mcoin_cost = 13; + * @param value The mcoinCost to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setMcoinCost(int value) { - retcode_ = value; + mcoinCost_ = value; onChanged(); return this; } /** - * int32 retcode = 5; + * uint32 mcoin_cost = 13; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearMcoinCost() { - retcode_ = 0; + mcoinCost_ = 0; onChanged(); return this; } - private int mcoinCost_ ; + private int hcoin_ ; /** - * uint32 mcoin_cost = 1; - * @return The mcoinCost. + * uint32 hcoin = 15; + * @return The hcoin. */ @java.lang.Override - public int getMcoinCost() { - return mcoinCost_; + public int getHcoin() { + return hcoin_; } /** - * uint32 mcoin_cost = 1; - * @param value The mcoinCost to set. + * uint32 hcoin = 15; + * @param value The hcoin to set. * @return This builder for chaining. */ - public Builder setMcoinCost(int value) { + public Builder setHcoin(int value) { - mcoinCost_ = value; + hcoin_ = value; onChanged(); return this; } /** - * uint32 mcoin_cost = 1; + * uint32 hcoin = 15; * @return This builder for chaining. */ - public Builder clearMcoinCost() { + public Builder clearHcoin() { - mcoinCost_ = 0; + hcoin_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHc static { java.lang.String[] descriptorData = { "\n\033McoinExchangeHcoinRsp.proto\"K\n\025McoinEx" + - "changeHcoinRsp\022\r\n\005hcoin\030\013 \001(\r\022\017\n\007retcode" + - "\030\005 \001(\005\022\022\n\nmcoin_cost\030\001 \001(\rB\033\n\031emu.grassc" + + "changeHcoinRsp\022\017\n\007retcode\030\010 \001(\005\022\022\n\nmcoin" + + "_cost\030\r \001(\r\022\r\n\005hcoin\030\017 \001(\rB\033\n\031emu.grassc" + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.McoinExchangeHcoinRspOuterClass.McoinExchangeHc internal_static_McoinExchangeHcoinRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_McoinExchangeHcoinRsp_descriptor, - new java.lang.String[] { "Hcoin", "Retcode", "McoinCost", }); + new java.lang.String[] { "Retcode", "McoinCost", "Hcoin", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MeetNpcReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MeetNpcReqOuterClass.java index c99f61df71e..cd196285cca 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MeetNpcReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MeetNpcReqOuterClass.java @@ -19,15 +19,15 @@ public interface MeetNpcReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 npc_id = 4; + * uint32 npc_id = 1; * @return The npcId. */ int getNpcId(); } /** * 
-   * CmdId: 25501
-   * Obf: LACPJBOMAAM
+   * CmdId: 5799
+   * obf: AICBEHIGDOB
    *
* * Protobuf type {@code MeetNpcReq} @@ -74,7 +74,7 @@ private MeetNpcReq( case 0: done = true; break; - case 32: { + case 8: { npcId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ private MeetNpcReq( emu.grasscutter.net.proto.MeetNpcReqOuterClass.MeetNpcReq.class, emu.grasscutter.net.proto.MeetNpcReqOuterClass.MeetNpcReq.Builder.class); } - public static final int NPC_ID_FIELD_NUMBER = 4; + public static final int NPC_ID_FIELD_NUMBER = 1; private int npcId_; /** - * uint32 npc_id = 4; + * uint32 npc_id = 1; * @return The npcId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (npcId_ != 0) { - output.writeUInt32(4, npcId_); + output.writeUInt32(1, npcId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (npcId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, npcId_); + .computeUInt32Size(1, npcId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25501
-     * Obf: LACPJBOMAAM
+     * CmdId: 5799
+     * obf: AICBEHIGDOB
      *
* * Protobuf type {@code MeetNpcReq} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int npcId_ ; /** - * uint32 npc_id = 4; + * uint32 npc_id = 1; * @return The npcId. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getNpcId() { return npcId_; } /** - * uint32 npc_id = 4; + * uint32 npc_id = 1; * @param value The npcId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setNpcId(int value) { return this; } /** - * uint32 npc_id = 4; + * uint32 npc_id = 1; * @return This builder for chaining. */ public Builder clearNpcId() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.MeetNpcReqOuterClass.MeetNpcReq getDefaultInsta static { java.lang.String[] descriptorData = { "\n\020MeetNpcReq.proto\"\034\n\nMeetNpcReq\022\016\n\006npc_" + - "id\030\004 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" + + "id\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" + "roto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ModifierActionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ModifierActionOuterClass.java index 55fd03d78f1..25d70cf3c23 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ModifierActionOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ModifierActionOuterClass.java @@ -135,15 +135,17 @@ private ModifierAction(int value) { descriptor; static { java.lang.String[] descriptorData = { - "\n\024ModifierAction.proto*H\n\016ModifierAction" + - "\022\031\n\025MODIFIER_ACTION_ADDED\020\000\022\033\n\027MODIFIER_" + - "ACTION_REMOVED\020\001B\033\n\031emu.grasscutter.net." + - "protob\006proto3" + "\n\024ModifierAction.proto\032\023AbilityString.pr" + + "oto*H\n\016ModifierAction\022\031\n\025MODIFIER_ACTION" + + "_ADDED\020\000\022\033\n\027MODIFIER_ACTION_REMOVED\020\001B\033\n" + + "\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { + emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(), }); + emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ModifierPropertyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ModifierPropertyOuterClass.java index 360a6137b59..b66165285e9 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ModifierPropertyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ModifierPropertyOuterClass.java @@ -19,29 +19,29 @@ public interface ModifierPropertyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .AbilityString key = 10; + * .AbilityString key = 7; * @return Whether the key field is set. */ boolean hasKey(); /** - * .AbilityString key = 10; + * .AbilityString key = 7; * @return The key. */ emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getKey(); /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getKeyOrBuilder(); /** - * float value = 14; + * float value = 15; * @return The value. */ float getValue(); } /** * 
-   * Obf: HFHFECKAJGB
+   * obf: JLGHKGKCHJP
    *
* * Protobuf type {@code ModifierProperty} @@ -88,7 +88,7 @@ private ModifierProperty( case 0: done = true; break; - case 82: { + case 58: { emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder subBuilder = null; if (key_ != null) { subBuilder = key_.toBuilder(); @@ -101,7 +101,7 @@ private ModifierProperty( break; } - case 117: { + case 125: { value_ = input.readFloat(); break; @@ -138,10 +138,10 @@ private ModifierProperty( emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.class, emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty.Builder.class); } - public static final int KEY_FIELD_NUMBER = 10; + public static final int KEY_FIELD_NUMBER = 7; private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString key_; /** - * .AbilityString key = 10; + * .AbilityString key = 7; * @return Whether the key field is set. */ @java.lang.Override @@ -149,7 +149,7 @@ public boolean hasKey() { return key_ != null; } /** - * .AbilityString key = 10; + * .AbilityString key = 7; * @return The key. */ @java.lang.Override @@ -157,17 +157,17 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getKey() return key_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : key_; } /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ @java.lang.Override public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getKeyOrBuilder() { return getKey(); } - public static final int VALUE_FIELD_NUMBER = 14; + public static final int VALUE_FIELD_NUMBER = 15; private float value_; /** - * float value = 14; + * float value = 15; * @return The value. */ @java.lang.Override @@ -190,10 +190,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (key_ != null) { - output.writeMessage(10, getKey()); + output.writeMessage(7, getKey()); } if (value_ != 0F) { - output.writeFloat(14, value_); + output.writeFloat(15, value_); } unknownFields.writeTo(output); } @@ -206,11 +206,11 @@ public int getSerializedSize() { size = 0; if (key_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, getKey()); + .computeMessageSize(7, getKey()); } if (value_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(14, value_); + .computeFloatSize(15, value_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -350,7 +350,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: HFHFECKAJGB
+     * obf: JLGHKGKCHJP
      *
* * Protobuf type {@code ModifierProperty} @@ -517,14 +517,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> keyBuilder_; /** - * .AbilityString key = 10; + * .AbilityString key = 7; * @return Whether the key field is set. */ public boolean hasKey() { return keyBuilder_ != null || key_ != null; } /** - * .AbilityString key = 10; + * .AbilityString key = 7; * @return The key. */ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getKey() { @@ -535,7 +535,7 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getKey() } } /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ public Builder setKey(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) { if (keyBuilder_ == null) { @@ -551,7 +551,7 @@ public Builder setKey(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityS return this; } /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ public Builder setKey( emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder builderForValue) { @@ -565,7 +565,7 @@ public Builder setKey( return this; } /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ public Builder mergeKey(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) { if (keyBuilder_ == null) { @@ -583,7 +583,7 @@ public Builder mergeKey(emu.grasscutter.net.proto.AbilityStringOuterClass.Abilit return this; } /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ public Builder clearKey() { if (keyBuilder_ == null) { @@ -597,7 +597,7 @@ public Builder clearKey() { return this; } /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder getKeyBuilder() { @@ -605,7 +605,7 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder g return getKeyFieldBuilder().getBuilder(); } /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getKeyOrBuilder() { if (keyBuilder_ != null) { @@ -616,7 +616,7 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder } } /** - * .AbilityString key = 10; + * .AbilityString key = 7; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> @@ -634,7 +634,7 @@ public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder private float value_ ; /** - * float value = 14; + * float value = 15; * @return The value. */ @java.lang.Override @@ -642,7 +642,7 @@ public float getValue() { return value_; } /** - * float value = 14; + * float value = 15; * @param value The value to set. * @return This builder for chaining. */ @@ -653,7 +653,7 @@ public Builder setValue(float value) { return this; } /** - * float value = 14; + * float value = 15; * @return This builder for chaining. */ public Builder clearValue() { @@ -730,8 +730,8 @@ public emu.grasscutter.net.proto.ModifierPropertyOuterClass.ModifierProperty get static { java.lang.String[] descriptorData = { "\n\026ModifierProperty.proto\032\023AbilityString." + - "proto\">\n\020ModifierProperty\022\033\n\003key\030\n \001(\0132\016" + - ".AbilityString\022\r\n\005value\030\016 \001(\002B\033\n\031emu.gra" + + "proto\">\n\020ModifierProperty\022\033\n\003key\030\007 \001(\0132\016" + + ".AbilityString\022\r\n\005value\030\017 \001(\002B\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MonsterAIConfigHashNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MonsterAIConfigHashNotifyOuterClass.java index e9611abfdce..d832cf06356 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MonsterAIConfigHashNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MonsterAIConfigHashNotifyOuterClass.java @@ -19,27 +19,27 @@ public interface MonsterAIConfigHashNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 hash_value = 1; + * int32 hash_value = 4; * @return The hashValue. */ int getHashValue(); /** - * uint32 entity_id = 10; - * @return The entityId. + * uint32 job_id = 8; + * @return The jobId. */ - int getEntityId(); + int getJobId(); /** - * uint32 job_id = 4; - * @return The jobId. + * uint32 entity_id = 15; + * @return The entityId. */ - int getJobId(); + int getEntityId(); } /** * 
-   * CmdId: 1317
-   * Obf: AGINFJOBPGP
+   * CmdId: 22925
+   * obf: GKJJJBBNCEP
    *
* * Protobuf type {@code MonsterAIConfigHashNotify} @@ -86,17 +86,17 @@ private MonsterAIConfigHashNotify( case 0: done = true; break; - case 8: { + case 32: { hashValue_ = input.readInt32(); break; } - case 32: { + case 64: { jobId_ = input.readUInt32(); break; } - case 80: { + case 120: { entityId_ = input.readUInt32(); break; @@ -133,10 +133,10 @@ private MonsterAIConfigHashNotify( emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOuterClass.MonsterAIConfigHashNotify.class, emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOuterClass.MonsterAIConfigHashNotify.Builder.class); } - public static final int HASH_VALUE_FIELD_NUMBER = 1; + public static final int HASH_VALUE_FIELD_NUMBER = 4; private int hashValue_; /** - * int32 hash_value = 1; + * int32 hash_value = 4; * @return The hashValue. */ @java.lang.Override @@ -144,26 +144,26 @@ public int getHashValue() { return hashValue_; } - public static final int ENTITY_ID_FIELD_NUMBER = 10; - private int entityId_; + public static final int JOB_ID_FIELD_NUMBER = 8; + private int jobId_; /** - * uint32 entity_id = 10; - * @return The entityId. + * uint32 job_id = 8; + * @return The jobId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getJobId() { + return jobId_; } - public static final int JOB_ID_FIELD_NUMBER = 4; - private int jobId_; + public static final int ENTITY_ID_FIELD_NUMBER = 15; + private int entityId_; /** - * uint32 job_id = 4; - * @return The jobId. + * uint32 entity_id = 15; + * @return The entityId. */ @java.lang.Override - public int getJobId() { - return jobId_; + public int getEntityId() { + return entityId_; } private byte memoizedIsInitialized = -1; @@ -181,13 +181,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (hashValue_ != 0) { - output.writeInt32(1, hashValue_); + output.writeInt32(4, hashValue_); } if (jobId_ != 0) { - output.writeUInt32(4, jobId_); + output.writeUInt32(8, jobId_); } if (entityId_ != 0) { - output.writeUInt32(10, entityId_); + output.writeUInt32(15, entityId_); } unknownFields.writeTo(output); } @@ -200,15 +200,15 @@ public int getSerializedSize() { size = 0; if (hashValue_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, hashValue_); + .computeInt32Size(4, hashValue_); } if (jobId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, jobId_); + .computeUInt32Size(8, jobId_); } if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, entityId_); + .computeUInt32Size(15, entityId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -227,10 +227,10 @@ public boolean equals(final java.lang.Object obj) { if (getHashValue() != other.getHashValue()) return false; - if (getEntityId() - != other.getEntityId()) return false; if (getJobId() != other.getJobId()) return false; + if (getEntityId() + != other.getEntityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -244,10 +244,10 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + HASH_VALUE_FIELD_NUMBER; hash = (53 * hash) + getHashValue(); - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); hash = (37 * hash) + JOB_ID_FIELD_NUMBER; hash = (53 * hash) + getJobId(); + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 1317
-     * Obf: AGINFJOBPGP
+     * CmdId: 22925
+     * obf: GKJJJBBNCEP
      *
* * Protobuf type {@code MonsterAIConfigHashNotify} @@ -388,10 +388,10 @@ public Builder clear() { super.clear(); hashValue_ = 0; - entityId_ = 0; - jobId_ = 0; + entityId_ = 0; + return this; } @@ -419,8 +419,8 @@ public emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOuterClass.MonsterAICo public emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOuterClass.MonsterAIConfigHashNotify buildPartial() { emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOuterClass.MonsterAIConfigHashNotify result = new emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOuterClass.MonsterAIConfigHashNotify(this); result.hashValue_ = hashValue_; - result.entityId_ = entityId_; result.jobId_ = jobId_; + result.entityId_ = entityId_; onBuilt(); return result; } @@ -472,12 +472,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOute if (other.getHashValue() != 0) { setHashValue(other.getHashValue()); } - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); - } if (other.getJobId() != 0) { setJobId(other.getJobId()); } + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -509,7 +509,7 @@ public Builder mergeFrom( private int hashValue_ ; /** - * int32 hash_value = 1; + * int32 hash_value = 4; * @return The hashValue. */ @java.lang.Override @@ -517,7 +517,7 @@ public int getHashValue() { return hashValue_; } /** - * int32 hash_value = 1; + * int32 hash_value = 4; * @param value The hashValue to set. * @return This builder for chaining. */ @@ -528,7 +528,7 @@ public Builder setHashValue(int value) { return this; } /** - * int32 hash_value = 1; + * int32 hash_value = 4; * @return This builder for chaining. */ public Builder clearHashValue() { @@ -538,64 +538,64 @@ public Builder clearHashValue() { return this; } - private int entityId_ ; + private int jobId_ ; /** - * uint32 entity_id = 10; - * @return The entityId. + * uint32 job_id = 8; + * @return The jobId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getJobId() { + return jobId_; } /** - * uint32 entity_id = 10; - * @param value The entityId to set. + * uint32 job_id = 8; + * @param value The jobId to set. * @return This builder for chaining. */ - public Builder setEntityId(int value) { + public Builder setJobId(int value) { - entityId_ = value; + jobId_ = value; onChanged(); return this; } /** - * uint32 entity_id = 10; + * uint32 job_id = 8; * @return This builder for chaining. */ - public Builder clearEntityId() { + public Builder clearJobId() { - entityId_ = 0; + jobId_ = 0; onChanged(); return this; } - private int jobId_ ; + private int entityId_ ; /** - * uint32 job_id = 4; - * @return The jobId. + * uint32 entity_id = 15; + * @return The entityId. */ @java.lang.Override - public int getJobId() { - return jobId_; + public int getEntityId() { + return entityId_; } /** - * uint32 job_id = 4; - * @param value The jobId to set. + * uint32 entity_id = 15; + * @param value The entityId to set. * @return This builder for chaining. */ - public Builder setJobId(int value) { + public Builder setEntityId(int value) { - jobId_ = value; + entityId_ = value; onChanged(); return this; } /** - * uint32 job_id = 4; + * uint32 entity_id = 15; * @return This builder for chaining. */ - public Builder clearJobId() { + public Builder clearEntityId() { - jobId_ = 0; + entityId_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOuterClass.MonsterAICo static { java.lang.String[] descriptorData = { "\n\037MonsterAIConfigHashNotify.proto\"R\n\031Mon" + - "sterAIConfigHashNotify\022\022\n\nhash_value\030\001 \001" + - "(\005\022\021\n\tentity_id\030\n \001(\r\022\016\n\006job_id\030\004 \001(\rB\033\n" + + "sterAIConfigHashNotify\022\022\n\nhash_value\030\004 \001" + + "(\005\022\016\n\006job_id\030\010 \001(\r\022\021\n\tentity_id\030\017 \001(\rB\033\n" + "\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.MonsterAIConfigHashNotifyOuterClass.MonsterAICo internal_static_MonsterAIConfigHashNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MonsterAIConfigHashNotify_descriptor, - new java.lang.String[] { "HashValue", "EntityId", "JobId", }); + new java.lang.String[] { "HashValue", "JobId", "EntityId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MonsterAlertChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MonsterAlertChangeNotifyOuterClass.java index e946471d6c8..38c1af12dbf 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MonsterAlertChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MonsterAlertChangeNotifyOuterClass.java @@ -19,38 +19,38 @@ public interface MonsterAlertChangeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 avatar_entity_id = 14; - * @return The avatarEntityId. - */ - int getAvatarEntityId(); - - /** - * uint32 is_alert = 1; - * @return The isAlert. - */ - int getIsAlert(); - - /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @return A list containing the monsterEntityList. */ java.util.List getMonsterEntityListList(); /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @return The count of monsterEntityList. */ int getMonsterEntityListCount(); /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @param index The index of the element to return. * @return The monsterEntityList at the given index. */ int getMonsterEntityList(int index); + + /** + * uint32 avatar_entity_id = 12; + * @return The avatarEntityId. + */ + int getAvatarEntityId(); + + /** + * uint32 is_alert = 8; + * @return The isAlert. + */ + int getIsAlert(); } /** * 
-   * CmdId: 20036
-   * Obf: BMANLPLANOJ
+   * CmdId: 6613
+   * obf: CCKEAAKBHJN
    *
* * Protobuf type {@code MonsterAlertChangeNotify} @@ -99,12 +99,7 @@ private MonsterAlertChangeNotify( case 0: done = true; break; - case 8: { - - isAlert_ = input.readUInt32(); - break; - } - case 96: { + case 24: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { monsterEntityList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -112,7 +107,7 @@ private MonsterAlertChangeNotify( monsterEntityList_.addInt(input.readUInt32()); break; } - case 98: { + case 26: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -125,7 +120,12 @@ private MonsterAlertChangeNotify( input.popLimit(limit); break; } - case 112: { + case 64: { + + isAlert_ = input.readUInt32(); + break; + } + case 96: { avatarEntityId_ = input.readUInt32(); break; @@ -165,32 +165,10 @@ private MonsterAlertChangeNotify( emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify.class, emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify.Builder.class); } - public static final int AVATAR_ENTITY_ID_FIELD_NUMBER = 14; - private int avatarEntityId_; - /** - * uint32 avatar_entity_id = 14; - * @return The avatarEntityId. - */ - @java.lang.Override - public int getAvatarEntityId() { - return avatarEntityId_; - } - - public static final int IS_ALERT_FIELD_NUMBER = 1; - private int isAlert_; - /** - * uint32 is_alert = 1; - * @return The isAlert. - */ - @java.lang.Override - public int getIsAlert() { - return isAlert_; - } - - public static final int MONSTER_ENTITY_LIST_FIELD_NUMBER = 12; + public static final int MONSTER_ENTITY_LIST_FIELD_NUMBER = 3; private com.google.protobuf.Internal.IntList monsterEntityList_; /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @return A list containing the monsterEntityList. */ @java.lang.Override @@ -199,14 +177,14 @@ public int getIsAlert() { return monsterEntityList_; } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @return The count of monsterEntityList. */ public int getMonsterEntityListCount() { return monsterEntityList_.size(); } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @param index The index of the element to return. * @return The monsterEntityList at the given index. */ @@ -215,6 +193,28 @@ public int getMonsterEntityList(int index) { } private int monsterEntityListMemoizedSerializedSize = -1; + public static final int AVATAR_ENTITY_ID_FIELD_NUMBER = 12; + private int avatarEntityId_; + /** + * uint32 avatar_entity_id = 12; + * @return The avatarEntityId. + */ + @java.lang.Override + public int getAvatarEntityId() { + return avatarEntityId_; + } + + public static final int IS_ALERT_FIELD_NUMBER = 8; + private int isAlert_; + /** + * uint32 is_alert = 8; + * @return The isAlert. + */ + @java.lang.Override + public int getIsAlert() { + return isAlert_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -230,18 +230,18 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (isAlert_ != 0) { - output.writeUInt32(1, isAlert_); - } if (getMonsterEntityListList().size() > 0) { - output.writeUInt32NoTag(98); + output.writeUInt32NoTag(26); output.writeUInt32NoTag(monsterEntityListMemoizedSerializedSize); } for (int i = 0; i < monsterEntityList_.size(); i++) { output.writeUInt32NoTag(monsterEntityList_.getInt(i)); } + if (isAlert_ != 0) { + output.writeUInt32(8, isAlert_); + } if (avatarEntityId_ != 0) { - output.writeUInt32(14, avatarEntityId_); + output.writeUInt32(12, avatarEntityId_); } unknownFields.writeTo(output); } @@ -252,10 +252,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (isAlert_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, isAlert_); - } { int dataSize = 0; for (int i = 0; i < monsterEntityList_.size(); i++) { @@ -270,9 +266,13 @@ public int getSerializedSize() { } monsterEntityListMemoizedSerializedSize = dataSize; } + if (isAlert_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(8, isAlert_); + } if (avatarEntityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, avatarEntityId_); + .computeUInt32Size(12, avatarEntityId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -289,12 +289,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify other = (emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify) obj; + if (!getMonsterEntityListList() + .equals(other.getMonsterEntityListList())) return false; if (getAvatarEntityId() != other.getAvatarEntityId()) return false; if (getIsAlert() != other.getIsAlert()) return false; - if (!getMonsterEntityListList() - .equals(other.getMonsterEntityListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -306,14 +306,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + AVATAR_ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getAvatarEntityId(); - hash = (37 * hash) + IS_ALERT_FIELD_NUMBER; - hash = (53 * hash) + getIsAlert(); if (getMonsterEntityListCount() > 0) { hash = (37 * hash) + MONSTER_ENTITY_LIST_FIELD_NUMBER; hash = (53 * hash) + getMonsterEntityListList().hashCode(); } + hash = (37 * hash) + AVATAR_ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getAvatarEntityId(); + hash = (37 * hash) + IS_ALERT_FIELD_NUMBER; + hash = (53 * hash) + getIsAlert(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -411,8 +411,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20036
-     * Obf: BMANLPLANOJ
+     * CmdId: 6613
+     * obf: CCKEAAKBHJN
      *
* * Protobuf type {@code MonsterAlertChangeNotify} @@ -452,12 +452,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + monsterEntityList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); avatarEntityId_ = 0; isAlert_ = 0; - monsterEntityList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -485,13 +485,13 @@ public emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlert public emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify buildPartial() { emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify result = new emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify(this); int from_bitField0_ = bitField0_; - result.avatarEntityId_ = avatarEntityId_; - result.isAlert_ = isAlert_; if (((bitField0_ & 0x00000001) != 0)) { monsterEntityList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.monsterEntityList_ = monsterEntityList_; + result.avatarEntityId_ = avatarEntityId_; + result.isAlert_ = isAlert_; onBuilt(); return result; } @@ -540,12 +540,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify other) { if (other == emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlertChangeNotify.getDefaultInstance()) return this; - if (other.getAvatarEntityId() != 0) { - setAvatarEntityId(other.getAvatarEntityId()); - } - if (other.getIsAlert() != 0) { - setIsAlert(other.getIsAlert()); - } if (!other.monsterEntityList_.isEmpty()) { if (monsterEntityList_.isEmpty()) { monsterEntityList_ = other.monsterEntityList_; @@ -556,6 +550,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuter } onChanged(); } + if (other.getAvatarEntityId() != 0) { + setAvatarEntityId(other.getAvatarEntityId()); + } + if (other.getIsAlert() != 0) { + setIsAlert(other.getIsAlert()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -586,68 +586,6 @@ public Builder mergeFrom( } private int bitField0_; - private int avatarEntityId_ ; - /** - * uint32 avatar_entity_id = 14; - * @return The avatarEntityId. - */ - @java.lang.Override - public int getAvatarEntityId() { - return avatarEntityId_; - } - /** - * uint32 avatar_entity_id = 14; - * @param value The avatarEntityId to set. - * @return This builder for chaining. - */ - public Builder setAvatarEntityId(int value) { - - avatarEntityId_ = value; - onChanged(); - return this; - } - /** - * uint32 avatar_entity_id = 14; - * @return This builder for chaining. - */ - public Builder clearAvatarEntityId() { - - avatarEntityId_ = 0; - onChanged(); - return this; - } - - private int isAlert_ ; - /** - * uint32 is_alert = 1; - * @return The isAlert. - */ - @java.lang.Override - public int getIsAlert() { - return isAlert_; - } - /** - * uint32 is_alert = 1; - * @param value The isAlert to set. - * @return This builder for chaining. - */ - public Builder setIsAlert(int value) { - - isAlert_ = value; - onChanged(); - return this; - } - /** - * uint32 is_alert = 1; - * @return This builder for chaining. - */ - public Builder clearIsAlert() { - - isAlert_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.Internal.IntList monsterEntityList_ = emptyIntList(); private void ensureMonsterEntityListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { @@ -656,7 +594,7 @@ private void ensureMonsterEntityListIsMutable() { } } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @return A list containing the monsterEntityList. */ public java.util.List @@ -665,14 +603,14 @@ private void ensureMonsterEntityListIsMutable() { java.util.Collections.unmodifiableList(monsterEntityList_) : monsterEntityList_; } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @return The count of monsterEntityList. */ public int getMonsterEntityListCount() { return monsterEntityList_.size(); } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @param index The index of the element to return. * @return The monsterEntityList at the given index. */ @@ -680,7 +618,7 @@ public int getMonsterEntityList(int index) { return monsterEntityList_.getInt(index); } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @param index The index to set the value at. * @param value The monsterEntityList to set. * @return This builder for chaining. @@ -693,7 +631,7 @@ public Builder setMonsterEntityList( return this; } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @param value The monsterEntityList to add. * @return This builder for chaining. */ @@ -704,7 +642,7 @@ public Builder addMonsterEntityList(int value) { return this; } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @param values The monsterEntityList to add. * @return This builder for chaining. */ @@ -717,7 +655,7 @@ public Builder addAllMonsterEntityList( return this; } /** - * repeated uint32 monster_entity_list = 12; + * repeated uint32 monster_entity_list = 3; * @return This builder for chaining. */ public Builder clearMonsterEntityList() { @@ -726,6 +664,68 @@ public Builder clearMonsterEntityList() { onChanged(); return this; } + + private int avatarEntityId_ ; + /** + * uint32 avatar_entity_id = 12; + * @return The avatarEntityId. + */ + @java.lang.Override + public int getAvatarEntityId() { + return avatarEntityId_; + } + /** + * uint32 avatar_entity_id = 12; + * @param value The avatarEntityId to set. + * @return This builder for chaining. + */ + public Builder setAvatarEntityId(int value) { + + avatarEntityId_ = value; + onChanged(); + return this; + } + /** + * uint32 avatar_entity_id = 12; + * @return This builder for chaining. + */ + public Builder clearAvatarEntityId() { + + avatarEntityId_ = 0; + onChanged(); + return this; + } + + private int isAlert_ ; + /** + * uint32 is_alert = 8; + * @return The isAlert. + */ + @java.lang.Override + public int getIsAlert() { + return isAlert_; + } + /** + * uint32 is_alert = 8; + * @param value The isAlert to set. + * @return This builder for chaining. + */ + public Builder setIsAlert(int value) { + + isAlert_ = value; + onChanged(); + return this; + } + /** + * uint32 is_alert = 8; + * @return This builder for chaining. + */ + public Builder clearIsAlert() { + + isAlert_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -794,9 +794,9 @@ public emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlert static { java.lang.String[] descriptorData = { "\n\036MonsterAlertChangeNotify.proto\"c\n\030Mons" + - "terAlertChangeNotify\022\030\n\020avatar_entity_id" + - "\030\016 \001(\r\022\020\n\010is_alert\030\001 \001(\r\022\033\n\023monster_enti" + - "ty_list\030\014 \003(\rB\033\n\031emu.grasscutter.net.pro" + + "terAlertChangeNotify\022\033\n\023monster_entity_l" + + "ist\030\003 \003(\r\022\030\n\020avatar_entity_id\030\014 \001(\r\022\020\n\010i" + + "s_alert\030\010 \001(\rB\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -808,7 +808,7 @@ public emu.grasscutter.net.proto.MonsterAlertChangeNotifyOuterClass.MonsterAlert internal_static_MonsterAlertChangeNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MonsterAlertChangeNotify_descriptor, - new java.lang.String[] { "AvatarEntityId", "IsAlert", "MonsterEntityList", }); + new java.lang.String[] { "MonsterEntityList", "AvatarEntityId", "IsAlert", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MonsterSummonTagNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MonsterSummonTagNotifyOuterClass.java index 3714fde263b..69682c8057e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MonsterSummonTagNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MonsterSummonTagNotifyOuterClass.java @@ -19,11 +19,17 @@ public interface MonsterSummonTagNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * map<uint32, uint32> summon_tag_map = 11; + * uint32 monster_entity_id = 1; + * @return The monsterEntityId. + */ + int getMonsterEntityId(); + + /** + * map<uint32, uint32> summon_tag_map = 6; */ int getSummonTagMapCount(); /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ boolean containsSummonTagMap( int key); @@ -34,34 +40,28 @@ boolean containsSummonTagMap( java.util.Map getSummonTagMap(); /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ java.util.Map getSummonTagMapMap(); /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ int getSummonTagMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ int getSummonTagMapOrThrow( int key); - - /** - * uint32 monster_entity_id = 12; - * @return The monsterEntityId. - */ - int getMonsterEntityId(); } /** * 
-   * CmdId: 26800
-   * Obf: NAILAGKGLBA
+   * CmdId: 21455
+   * obf: IAAGFBPNBAJ
    *
* * Protobuf type {@code MonsterSummonTagNotify} @@ -109,7 +109,12 @@ private MonsterSummonTagNotify( case 0: done = true; break; - case 90: { + case 8: { + + monsterEntityId_ = input.readUInt32(); + break; + } + case 50: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { summonTagMap_ = com.google.protobuf.MapField.newMapField( SummonTagMapDefaultEntryHolder.defaultEntry); @@ -122,11 +127,6 @@ private MonsterSummonTagNotify( summonTagMap__.getKey(), summonTagMap__.getValue()); break; } - case 96: { - - monsterEntityId_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -156,7 +156,7 @@ private MonsterSummonTagNotify( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 11: + case 6: return internalGetSummonTagMap(); default: throw new RuntimeException( @@ -171,7 +171,18 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify.class, emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify.Builder.class); } - public static final int SUMMON_TAG_MAP_FIELD_NUMBER = 11; + public static final int MONSTER_ENTITY_ID_FIELD_NUMBER = 1; + private int monsterEntityId_; + /** + * uint32 monster_entity_id = 1; + * @return The monsterEntityId. + */ + @java.lang.Override + public int getMonsterEntityId() { + return monsterEntityId_; + } + + public static final int SUMMON_TAG_MAP_FIELD_NUMBER = 6; private static final class SummonTagMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -198,7 +209,7 @@ public int getSummonTagMapCount() { return internalGetSummonTagMap().getMap().size(); } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ @java.lang.Override @@ -216,7 +227,7 @@ public java.util.Map getSummonTagMap() { return getSummonTagMapMap(); } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ @java.lang.Override @@ -224,7 +235,7 @@ public java.util.Map getSummonTagMapMap() return internalGetSummonTagMap().getMap(); } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ @java.lang.Override @@ -237,7 +248,7 @@ public int getSummonTagMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ @java.lang.Override @@ -252,17 +263,6 @@ public int getSummonTagMapOrThrow( return map.get(key); } - public static final int MONSTER_ENTITY_ID_FIELD_NUMBER = 12; - private int monsterEntityId_; - /** - * uint32 monster_entity_id = 12; - * @return The monsterEntityId. - */ - @java.lang.Override - public int getMonsterEntityId() { - return monsterEntityId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -277,15 +277,15 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (monsterEntityId_ != 0) { + output.writeUInt32(1, monsterEntityId_); + } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetSummonTagMap(), SummonTagMapDefaultEntryHolder.defaultEntry, - 11); - if (monsterEntityId_ != 0) { - output.writeUInt32(12, monsterEntityId_); - } + 6); unknownFields.writeTo(output); } @@ -295,6 +295,10 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (monsterEntityId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(1, monsterEntityId_); + } for (java.util.Map.Entry entry : internalGetSummonTagMap().getMap().entrySet()) { com.google.protobuf.MapEntry @@ -303,11 +307,7 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, summonTagMap__); - } - if (monsterEntityId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, monsterEntityId_); + .computeMessageSize(6, summonTagMap__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -324,10 +324,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify other = (emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify) obj; - if (!internalGetSummonTagMap().equals( - other.internalGetSummonTagMap())) return false; if (getMonsterEntityId() != other.getMonsterEntityId()) return false; + if (!internalGetSummonTagMap().equals( + other.internalGetSummonTagMap())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -339,12 +339,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MONSTER_ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getMonsterEntityId(); if (!internalGetSummonTagMap().getMap().isEmpty()) { hash = (37 * hash) + SUMMON_TAG_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetSummonTagMap().hashCode(); } - hash = (37 * hash) + MONSTER_ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getMonsterEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -442,8 +442,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 26800
-     * Obf: NAILAGKGLBA
+     * CmdId: 21455
+     * obf: IAAGFBPNBAJ
      *
* * Protobuf type {@code MonsterSummonTagNotify} @@ -461,7 +461,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 11: + case 6: return internalGetSummonTagMap(); default: throw new RuntimeException( @@ -472,7 +472,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 11: + case 6: return internalGetMutableSummonTagMap(); default: throw new RuntimeException( @@ -505,9 +505,9 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - internalGetMutableSummonTagMap().clear(); monsterEntityId_ = 0; + internalGetMutableSummonTagMap().clear(); return this; } @@ -535,9 +535,9 @@ public emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonT public emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify buildPartial() { emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify result = new emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify(this); int from_bitField0_ = bitField0_; + result.monsterEntityId_ = monsterEntityId_; result.summonTagMap_ = internalGetSummonTagMap(); result.summonTagMap_.makeImmutable(); - result.monsterEntityId_ = monsterEntityId_; onBuilt(); return result; } @@ -586,11 +586,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify other) { if (other == emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonTagNotify.getDefaultInstance()) return this; - internalGetMutableSummonTagMap().mergeFrom( - other.internalGetSummonTagMap()); if (other.getMonsterEntityId() != 0) { setMonsterEntityId(other.getMonsterEntityId()); } + internalGetMutableSummonTagMap().mergeFrom( + other.internalGetSummonTagMap()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -621,6 +621,37 @@ public Builder mergeFrom( } private int bitField0_; + private int monsterEntityId_ ; + /** + * uint32 monster_entity_id = 1; + * @return The monsterEntityId. + */ + @java.lang.Override + public int getMonsterEntityId() { + return monsterEntityId_; + } + /** + * uint32 monster_entity_id = 1; + * @param value The monsterEntityId to set. + * @return This builder for chaining. + */ + public Builder setMonsterEntityId(int value) { + + monsterEntityId_ = value; + onChanged(); + return this; + } + /** + * uint32 monster_entity_id = 1; + * @return This builder for chaining. + */ + public Builder clearMonsterEntityId() { + + monsterEntityId_ = 0; + onChanged(); + return this; + } + private com.google.protobuf.MapField< java.lang.Integer, java.lang.Integer> summonTagMap_; private com.google.protobuf.MapField @@ -648,7 +679,7 @@ public int getSummonTagMapCount() { return internalGetSummonTagMap().getMap().size(); } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ @java.lang.Override @@ -666,7 +697,7 @@ public java.util.Map getSummonTagMap() { return getSummonTagMapMap(); } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ @java.lang.Override @@ -674,7 +705,7 @@ public java.util.Map getSummonTagMapMap() return internalGetSummonTagMap().getMap(); } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ @java.lang.Override @@ -687,7 +718,7 @@ public int getSummonTagMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ @java.lang.Override @@ -708,7 +739,7 @@ public Builder clearSummonTagMap() { return this; } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ public Builder removeSummonTagMap( @@ -727,7 +758,7 @@ public Builder removeSummonTagMap( return internalGetMutableSummonTagMap().getMutableMap(); } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ public Builder putSummonTagMap( int key, @@ -739,7 +770,7 @@ public Builder putSummonTagMap( return this; } /** - * map<uint32, uint32> summon_tag_map = 11; + * map<uint32, uint32> summon_tag_map = 6; */ public Builder putAllSummonTagMap( @@ -748,37 +779,6 @@ public Builder putAllSummonTagMap( .putAll(values); return this; } - - private int monsterEntityId_ ; - /** - * uint32 monster_entity_id = 12; - * @return The monsterEntityId. - */ - @java.lang.Override - public int getMonsterEntityId() { - return monsterEntityId_; - } - /** - * uint32 monster_entity_id = 12; - * @param value The monsterEntityId to set. - * @return This builder for chaining. - */ - public Builder setMonsterEntityId(int value) { - - monsterEntityId_ = value; - onChanged(); - return this; - } - /** - * uint32 monster_entity_id = 12; - * @return This builder for chaining. - */ - public Builder clearMonsterEntityId() { - - monsterEntityId_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -852,9 +852,9 @@ public emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonT static { java.lang.String[] descriptorData = { "\n\034MonsterSummonTagNotify.proto\"\253\001\n\026Monst" + - "erSummonTagNotify\022A\n\016summon_tag_map\030\013 \003(" + - "\0132).MonsterSummonTagNotify.SummonTagMapE" + - "ntry\022\031\n\021monster_entity_id\030\014 \001(\r\0323\n\021Summo" + + "erSummonTagNotify\022\031\n\021monster_entity_id\030\001" + + " \001(\r\022A\n\016summon_tag_map\030\006 \003(\0132).MonsterSu" + + "mmonTagNotify.SummonTagMapEntry\0323\n\021Summo" + "nTagMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r" + ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" + "3" @@ -868,7 +868,7 @@ public emu.grasscutter.net.proto.MonsterSummonTagNotifyOuterClass.MonsterSummonT internal_static_MonsterSummonTagNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MonsterSummonTagNotify_descriptor, - new java.lang.String[] { "SummonTagMap", "MonsterEntityId", }); + new java.lang.String[] { "MonsterEntityId", "SummonTagMap", }); internal_static_MonsterSummonTagNotify_SummonTagMapEntry_descriptor = internal_static_MonsterSummonTagNotify_descriptor.getNestedTypes().get(0); internal_static_MonsterSummonTagNotify_SummonTagMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MsgParamOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MsgParamOuterClass.java index dab662cba8e..8cded859293 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MsgParamOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MsgParamOuterClass.java @@ -19,51 +19,47 @@ public interface MsgParamOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 int_param = 8; + * string str_param = 11; + * @return Whether the strParam field is set. + */ + boolean hasStrParam(); + /** + * string str_param = 11; + * @return The strParam. + */ + java.lang.String getStrParam(); + /** + * string str_param = 11; + * @return The bytes for strParam. + */ + com.google.protobuf.ByteString + getStrParamBytes(); + + /** + * uint32 int_param = 13; * @return Whether the intParam field is set. */ boolean hasIntParam(); /** - * uint32 int_param = 8; + * uint32 int_param = 13; * @return The intParam. */ int getIntParam(); /** - * float flt_param = 15; + * float flt_param = 12; * @return Whether the fltParam field is set. */ boolean hasFltParam(); /** - * float flt_param = 15; + * float flt_param = 12; * @return The fltParam. */ float getFltParam(); - /** - * string str_param = 1; - * @return Whether the strParam field is set. - */ - boolean hasStrParam(); - /** - * string str_param = 1; - * @return The strParam. - */ - java.lang.String getStrParam(); - /** - * string str_param = 1; - * @return The bytes for strParam. - */ - com.google.protobuf.ByteString - getStrParamBytes(); - public emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam.ParamCase getParamCase(); } /** - * 
-   * Obf: PAAMEAIJADP
-   *
- * * Protobuf type {@code MsgParam} */ public static final class MsgParam extends @@ -108,20 +104,20 @@ private MsgParam( case 0: done = true; break; - case 10: { + case 90: { java.lang.String s = input.readStringRequireUtf8(); - paramCase_ = 1; + paramCase_ = 11; param_ = s; break; } - case 64: { - paramCase_ = 8; - param_ = input.readUInt32(); + case 101: { + paramCase_ = 12; + param_ = input.readFloat(); break; } - case 125: { - paramCase_ = 15; - param_ = input.readFloat(); + case 104: { + paramCase_ = 13; + param_ = input.readUInt32(); break; } default: { @@ -161,9 +157,9 @@ private MsgParam( public enum ParamCase implements com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { - INT_PARAM(8), - FLT_PARAM(15), - STR_PARAM(1), + STR_PARAM(11), + INT_PARAM(13), + FLT_PARAM(12), PARAM_NOT_SET(0); private final int value; private ParamCase(int value) { @@ -181,9 +177,9 @@ public static ParamCase valueOf(int value) { public static ParamCase forNumber(int value) { switch (value) { - case 8: return INT_PARAM; - case 15: return FLT_PARAM; - case 1: return STR_PARAM; + case 11: return STR_PARAM; + case 13: return INT_PARAM; + case 12: return FLT_PARAM; case 0: return PARAM_NOT_SET; default: return null; } @@ -199,63 +195,21 @@ public int getNumber() { paramCase_); } - public static final int INT_PARAM_FIELD_NUMBER = 8; + public static final int STR_PARAM_FIELD_NUMBER = 11; /** - * uint32 int_param = 8; - * @return Whether the intParam field is set. - */ - @java.lang.Override - public boolean hasIntParam() { - return paramCase_ == 8; - } - /** - * uint32 int_param = 8; - * @return The intParam. - */ - @java.lang.Override - public int getIntParam() { - if (paramCase_ == 8) { - return (java.lang.Integer) param_; - } - return 0; - } - - public static final int FLT_PARAM_FIELD_NUMBER = 15; - /** - * float flt_param = 15; - * @return Whether the fltParam field is set. - */ - @java.lang.Override - public boolean hasFltParam() { - return paramCase_ == 15; - } - /** - * float flt_param = 15; - * @return The fltParam. - */ - @java.lang.Override - public float getFltParam() { - if (paramCase_ == 15) { - return (java.lang.Float) param_; - } - return 0F; - } - - public static final int STR_PARAM_FIELD_NUMBER = 1; - /** - * string str_param = 1; + * string str_param = 11; * @return Whether the strParam field is set. */ public boolean hasStrParam() { - return paramCase_ == 1; + return paramCase_ == 11; } /** - * string str_param = 1; + * string str_param = 11; * @return The strParam. */ public java.lang.String getStrParam() { java.lang.Object ref = ""; - if (paramCase_ == 1) { + if (paramCase_ == 11) { ref = param_; } if (ref instanceof java.lang.String) { @@ -264,27 +218,27 @@ public java.lang.String getStrParam() { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (paramCase_ == 1) { + if (paramCase_ == 11) { param_ = s; } return s; } } /** - * string str_param = 1; + * string str_param = 11; * @return The bytes for strParam. */ public com.google.protobuf.ByteString getStrParamBytes() { java.lang.Object ref = ""; - if (paramCase_ == 1) { + if (paramCase_ == 11) { ref = param_; } if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - if (paramCase_ == 1) { + if (paramCase_ == 11) { param_ = b; } return b; @@ -293,6 +247,48 @@ public java.lang.String getStrParam() { } } + public static final int INT_PARAM_FIELD_NUMBER = 13; + /** + * uint32 int_param = 13; + * @return Whether the intParam field is set. + */ + @java.lang.Override + public boolean hasIntParam() { + return paramCase_ == 13; + } + /** + * uint32 int_param = 13; + * @return The intParam. + */ + @java.lang.Override + public int getIntParam() { + if (paramCase_ == 13) { + return (java.lang.Integer) param_; + } + return 0; + } + + public static final int FLT_PARAM_FIELD_NUMBER = 12; + /** + * float flt_param = 12; + * @return Whether the fltParam field is set. + */ + @java.lang.Override + public boolean hasFltParam() { + return paramCase_ == 12; + } + /** + * float flt_param = 12; + * @return The fltParam. + */ + @java.lang.Override + public float getFltParam() { + if (paramCase_ == 12) { + return (java.lang.Float) param_; + } + return 0F; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -307,16 +303,16 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (paramCase_ == 1) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, param_); - } - if (paramCase_ == 8) { - output.writeUInt32( - 8, (int)((java.lang.Integer) param_)); + if (paramCase_ == 11) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 11, param_); } - if (paramCase_ == 15) { + if (paramCase_ == 12) { output.writeFloat( - 15, (float)((java.lang.Float) param_)); + 12, (float)((java.lang.Float) param_)); + } + if (paramCase_ == 13) { + output.writeUInt32( + 13, (int)((java.lang.Integer) param_)); } unknownFields.writeTo(output); } @@ -327,18 +323,18 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (paramCase_ == 1) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, param_); + if (paramCase_ == 11) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, param_); } - if (paramCase_ == 8) { + if (paramCase_ == 12) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size( - 8, (int)((java.lang.Integer) param_)); + .computeFloatSize( + 12, (float)((java.lang.Float) param_)); } - if (paramCase_ == 15) { + if (paramCase_ == 13) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize( - 15, (float)((java.lang.Float) param_)); + .computeUInt32Size( + 13, (int)((java.lang.Integer) param_)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -357,19 +353,19 @@ public boolean equals(final java.lang.Object obj) { if (!getParamCase().equals(other.getParamCase())) return false; switch (paramCase_) { - case 8: + case 11: + if (!getStrParam() + .equals(other.getStrParam())) return false; + break; + case 13: if (getIntParam() != other.getIntParam()) return false; break; - case 15: + case 12: if (java.lang.Float.floatToIntBits(getFltParam()) != java.lang.Float.floatToIntBits( other.getFltParam())) return false; break; - case 1: - if (!getStrParam() - .equals(other.getStrParam())) return false; - break; case 0: default: } @@ -385,19 +381,19 @@ public int hashCode() { int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); switch (paramCase_) { - case 8: + case 11: + hash = (37 * hash) + STR_PARAM_FIELD_NUMBER; + hash = (53 * hash) + getStrParam().hashCode(); + break; + case 13: hash = (37 * hash) + INT_PARAM_FIELD_NUMBER; hash = (53 * hash) + getIntParam(); break; - case 15: + case 12: hash = (37 * hash) + FLT_PARAM_FIELD_NUMBER; hash = (53 * hash) + java.lang.Float.floatToIntBits( getFltParam()); break; - case 1: - hash = (37 * hash) + STR_PARAM_FIELD_NUMBER; - hash = (53 * hash) + getStrParam().hashCode(); - break; case 0: default: } @@ -497,10 +493,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: PAAMEAIJADP
-     *
- * * Protobuf type {@code MsgParam} */ public static final class Builder extends @@ -566,13 +558,13 @@ public emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam build() { @java.lang.Override public emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam buildPartial() { emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam result = new emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam(this); - if (paramCase_ == 8) { + if (paramCase_ == 11) { result.param_ = param_; } - if (paramCase_ == 15) { + if (paramCase_ == 13) { result.param_ = param_; } - if (paramCase_ == 1) { + if (paramCase_ == 12) { result.param_ = param_; } result.paramCase_ = paramCase_; @@ -625,6 +617,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam other) { if (other == emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam.getDefaultInstance()) return this; switch (other.getParamCase()) { + case STR_PARAM: { + paramCase_ = 11; + param_ = other.param_; + onChanged(); + break; + } case INT_PARAM: { setIntParam(other.getIntParam()); break; @@ -633,12 +631,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam o setFltParam(other.getFltParam()); break; } - case STR_PARAM: { - paramCase_ = 1; - param_ = other.param_; - onChanged(); - break; - } case PARAM_NOT_SET: { break; } @@ -688,110 +680,28 @@ public Builder clearParam() { /** - * uint32 int_param = 8; - * @return Whether the intParam field is set. - */ - public boolean hasIntParam() { - return paramCase_ == 8; - } - /** - * uint32 int_param = 8; - * @return The intParam. - */ - public int getIntParam() { - if (paramCase_ == 8) { - return (java.lang.Integer) param_; - } - return 0; - } - /** - * uint32 int_param = 8; - * @param value The intParam to set. - * @return This builder for chaining. - */ - public Builder setIntParam(int value) { - paramCase_ = 8; - param_ = value; - onChanged(); - return this; - } - /** - * uint32 int_param = 8; - * @return This builder for chaining. - */ - public Builder clearIntParam() { - if (paramCase_ == 8) { - paramCase_ = 0; - param_ = null; - onChanged(); - } - return this; - } - - /** - * float flt_param = 15; - * @return Whether the fltParam field is set. - */ - public boolean hasFltParam() { - return paramCase_ == 15; - } - /** - * float flt_param = 15; - * @return The fltParam. - */ - public float getFltParam() { - if (paramCase_ == 15) { - return (java.lang.Float) param_; - } - return 0F; - } - /** - * float flt_param = 15; - * @param value The fltParam to set. - * @return This builder for chaining. - */ - public Builder setFltParam(float value) { - paramCase_ = 15; - param_ = value; - onChanged(); - return this; - } - /** - * float flt_param = 15; - * @return This builder for chaining. - */ - public Builder clearFltParam() { - if (paramCase_ == 15) { - paramCase_ = 0; - param_ = null; - onChanged(); - } - return this; - } - - /** - * string str_param = 1; + * string str_param = 11; * @return Whether the strParam field is set. */ @java.lang.Override public boolean hasStrParam() { - return paramCase_ == 1; + return paramCase_ == 11; } /** - * string str_param = 1; + * string str_param = 11; * @return The strParam. */ @java.lang.Override public java.lang.String getStrParam() { java.lang.Object ref = ""; - if (paramCase_ == 1) { + if (paramCase_ == 11) { ref = param_; } if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - if (paramCase_ == 1) { + if (paramCase_ == 11) { param_ = s; } return s; @@ -800,21 +710,21 @@ public java.lang.String getStrParam() { } } /** - * string str_param = 1; + * string str_param = 11; * @return The bytes for strParam. */ @java.lang.Override public com.google.protobuf.ByteString getStrParamBytes() { java.lang.Object ref = ""; - if (paramCase_ == 1) { + if (paramCase_ == 11) { ref = param_; } if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - if (paramCase_ == 1) { + if (paramCase_ == 11) { param_ = b; } return b; @@ -823,7 +733,7 @@ public java.lang.String getStrParam() { } } /** - * string str_param = 1; + * string str_param = 11; * @param value The strParam to set. * @return This builder for chaining. */ @@ -832,17 +742,17 @@ public Builder setStrParam( if (value == null) { throw new NullPointerException(); } - paramCase_ = 1; + paramCase_ = 11; param_ = value; onChanged(); return this; } /** - * string str_param = 1; + * string str_param = 11; * @return This builder for chaining. */ public Builder clearStrParam() { - if (paramCase_ == 1) { + if (paramCase_ == 11) { paramCase_ = 0; param_ = null; onChanged(); @@ -850,7 +760,7 @@ public Builder clearStrParam() { return this; } /** - * string str_param = 1; + * string str_param = 11; * @param value The bytes for strParam to set. * @return This builder for chaining. */ @@ -860,11 +770,93 @@ public Builder setStrParamBytes( throw new NullPointerException(); } checkByteStringIsUtf8(value); - paramCase_ = 1; + paramCase_ = 11; param_ = value; onChanged(); return this; } + + /** + * uint32 int_param = 13; + * @return Whether the intParam field is set. + */ + public boolean hasIntParam() { + return paramCase_ == 13; + } + /** + * uint32 int_param = 13; + * @return The intParam. + */ + public int getIntParam() { + if (paramCase_ == 13) { + return (java.lang.Integer) param_; + } + return 0; + } + /** + * uint32 int_param = 13; + * @param value The intParam to set. + * @return This builder for chaining. + */ + public Builder setIntParam(int value) { + paramCase_ = 13; + param_ = value; + onChanged(); + return this; + } + /** + * uint32 int_param = 13; + * @return This builder for chaining. + */ + public Builder clearIntParam() { + if (paramCase_ == 13) { + paramCase_ = 0; + param_ = null; + onChanged(); + } + return this; + } + + /** + * float flt_param = 12; + * @return Whether the fltParam field is set. + */ + public boolean hasFltParam() { + return paramCase_ == 12; + } + /** + * float flt_param = 12; + * @return The fltParam. + */ + public float getFltParam() { + if (paramCase_ == 12) { + return (java.lang.Float) param_; + } + return 0F; + } + /** + * float flt_param = 12; + * @param value The fltParam to set. + * @return This builder for chaining. + */ + public Builder setFltParam(float value) { + paramCase_ = 12; + param_ = value; + onChanged(); + return this; + } + /** + * float flt_param = 12; + * @return This builder for chaining. + */ + public Builder clearFltParam() { + if (paramCase_ == 12) { + paramCase_ = 0; + param_ = null; + onChanged(); + } + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -932,9 +924,9 @@ public emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam getDefaultInstanceF descriptor; static { java.lang.String[] descriptorData = { - "\n\016MsgParam.proto\"R\n\010MsgParam\022\023\n\tint_para" + - "m\030\010 \001(\rH\000\022\023\n\tflt_param\030\017 \001(\002H\000\022\023\n\tstr_pa" + - "ram\030\001 \001(\tH\000B\007\n\005paramB\033\n\031emu.grasscutter." + + "\n\016MsgParam.proto\"R\n\010MsgParam\022\023\n\tstr_para" + + "m\030\013 \001(\tH\000\022\023\n\tint_param\030\r \001(\rH\000\022\023\n\tflt_pa" + + "ram\030\014 \001(\002H\000B\007\n\005paramB\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -946,7 +938,7 @@ public emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam getDefaultInstanceF internal_static_MsgParam_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MsgParam_descriptor, - new java.lang.String[] { "IntParam", "FltParam", "StrParam", "Param", }); + new java.lang.String[] { "StrParam", "IntParam", "FltParam", "Param", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MultiCharacterDungeonSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MultiCharacterDungeonSettleInfoOuterClass.java index 8c5a05ec28d..ceb89849cce 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MultiCharacterDungeonSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MultiCharacterDungeonSettleInfoOuterClass.java @@ -19,75 +19,71 @@ public interface MultiCharacterDungeonSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 AJFIDJINPLL = 15; - * @return A list containing the aJFIDJINPLL. + * uint32 DMNLDPPGOKG = 1; + * @return The dMNLDPPGOKG. */ - java.util.List getAJFIDJINPLLList(); + int getDMNLDPPGOKG(); + /** - * repeated uint32 AJFIDJINPLL = 15; - * @return The count of aJFIDJINPLL. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - int getAJFIDJINPLLCount(); + java.util.List + getKGOGFPODDLJList(); /** - * repeated uint32 AJFIDJINPLL = 15; - * @param index The index of the element to return. - * @return The aJFIDJINPLL at the given index. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - int getAJFIDJINPLL(int index); - + emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB getKGOGFPODDLJ(int index); /** - * bool is_new_record = 12; - * @return The isNewRecord. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - boolean getIsNewRecord(); - + int getKGOGFPODDLJCount(); /** - * uint32 stage_id = 14; - * @return The stageId. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - int getStageId(); - + java.util.List + getKGOGFPODDLJOrBuilderList(); /** - * uint32 level_id = 4; - * @return The levelId. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - int getLevelId(); + emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder getKGOGFPODDLJOrBuilder( + int index); /** - * uint32 difficulty = 7; - * @return The difficulty. + * uint32 MEMPKCGNNMF = 4; + * @return The mEMPKCGNNMF. */ - int getDifficulty(); + int getMEMPKCGNNMF(); /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * uint32 PJJAOILBFBN = 7; + * @return The pJJAOILBFBN. */ - java.util.List - getTeamInfoListList(); + int getPJJAOILBFBN(); + /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * bool is_new_record = 8; + * @return The isNewRecord. */ - emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB getTeamInfoList(int index); + boolean getIsNewRecord(); + /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated uint32 LCJICEEEKBI = 9; + * @return A list containing the lCJICEEEKBI. */ - int getTeamInfoListCount(); + java.util.List getLCJICEEEKBIList(); /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated uint32 LCJICEEEKBI = 9; + * @return The count of lCJICEEEKBI. */ - java.util.List - getTeamInfoListOrBuilderList(); + int getLCJICEEEKBICount(); /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated uint32 LCJICEEEKBI = 9; + * @param index The index of the element to return. + * @return The lCJICEEEKBI at the given index. */ - emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder getTeamInfoListOrBuilder( - int index); + int getLCJICEEEKBI(int index); } /** - * 
-   * Obf: BHIDAAPPGHP
-   *
- * * Protobuf type {@code MultiCharacterDungeonSettleInfo} */ public static final class MultiCharacterDungeonSettleInfo extends @@ -100,8 +96,8 @@ private MultiCharacterDungeonSettleInfo(com.google.protobuf.GeneratedMessageV3.B super(builder); } private MultiCharacterDungeonSettleInfo() { - aJFIDJINPLL_ = emptyIntList(); - teamInfoList_ = java.util.Collections.emptyList(); + kGOGFPODDLJ_ = java.util.Collections.emptyList(); + lCJICEEEKBI_ = emptyIntList(); } @java.lang.Override @@ -135,52 +131,52 @@ private MultiCharacterDungeonSettleInfo( case 0: done = true; break; - case 18: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - teamInfoList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; + case 8: { + + dMNLDPPGOKG_ = input.readUInt32(); + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + kGOGFPODDLJ_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; } - teamInfoList_.add( + kGOGFPODDLJ_.add( input.readMessage(emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.parser(), extensionRegistry)); break; } case 32: { - levelId_ = input.readUInt32(); + mEMPKCGNNMF_ = input.readUInt32(); break; } case 56: { - difficulty_ = input.readUInt32(); + pJJAOILBFBN_ = input.readUInt32(); break; } - case 96: { + case 64: { isNewRecord_ = input.readBool(); break; } - case 112: { - - stageId_ = input.readUInt32(); - break; - } - case 120: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - aJFIDJINPLL_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + case 72: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + lCJICEEEKBI_ = newIntList(); + mutable_bitField0_ |= 0x00000002; } - aJFIDJINPLL_.addInt(input.readUInt32()); + lCJICEEEKBI_.addInt(input.readUInt32()); break; } - case 122: { + case 74: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - aJFIDJINPLL_ = newIntList(); - mutable_bitField0_ |= 0x00000001; + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + lCJICEEEKBI_ = newIntList(); + mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - aJFIDJINPLL_.addInt(input.readUInt32()); + lCJICEEEKBI_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -200,11 +196,11 @@ private MultiCharacterDungeonSettleInfo( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - teamInfoList_ = java.util.Collections.unmodifiableList(teamInfoList_); - } if (((mutable_bitField0_ & 0x00000001) != 0)) { - aJFIDJINPLL_.makeImmutable(); // C + kGOGFPODDLJ_ = java.util.Collections.unmodifiableList(kGOGFPODDLJ_); + } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + lCJICEEEKBI_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -223,117 +219,117 @@ private MultiCharacterDungeonSettleInfo( emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.class, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder.class); } - public static final int AJFIDJINPLL_FIELD_NUMBER = 15; - private com.google.protobuf.Internal.IntList aJFIDJINPLL_; + public static final int DMNLDPPGOKG_FIELD_NUMBER = 1; + private int dMNLDPPGOKG_; /** - * repeated uint32 AJFIDJINPLL = 15; - * @return A list containing the aJFIDJINPLL. + * uint32 DMNLDPPGOKG = 1; + * @return The dMNLDPPGOKG. */ @java.lang.Override - public java.util.List - getAJFIDJINPLLList() { - return aJFIDJINPLL_; + public int getDMNLDPPGOKG() { + return dMNLDPPGOKG_; } + + public static final int KGOGFPODDLJ_FIELD_NUMBER = 3; + private java.util.List kGOGFPODDLJ_; /** - * repeated uint32 AJFIDJINPLL = 15; - * @return The count of aJFIDJINPLL. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public int getAJFIDJINPLLCount() { - return aJFIDJINPLL_.size(); + @java.lang.Override + public java.util.List getKGOGFPODDLJList() { + return kGOGFPODDLJ_; } /** - * repeated uint32 AJFIDJINPLL = 15; - * @param index The index of the element to return. - * @return The aJFIDJINPLL at the given index. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public int getAJFIDJINPLL(int index) { - return aJFIDJINPLL_.getInt(index); + @java.lang.Override + public java.util.List + getKGOGFPODDLJOrBuilderList() { + return kGOGFPODDLJ_; } - private int aJFIDJINPLLMemoizedSerializedSize = -1; - - public static final int IS_NEW_RECORD_FIELD_NUMBER = 12; - private boolean isNewRecord_; /** - * bool is_new_record = 12; - * @return The isNewRecord. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getKGOGFPODDLJCount() { + return kGOGFPODDLJ_.size(); } - - public static final int STAGE_ID_FIELD_NUMBER = 14; - private int stageId_; /** - * uint32 stage_id = 14; - * @return The stageId. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ @java.lang.Override - public int getStageId() { - return stageId_; + public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB getKGOGFPODDLJ(int index) { + return kGOGFPODDLJ_.get(index); } - - public static final int LEVEL_ID_FIELD_NUMBER = 4; - private int levelId_; /** - * uint32 level_id = 4; - * @return The levelId. + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ @java.lang.Override - public int getLevelId() { - return levelId_; + public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder getKGOGFPODDLJOrBuilder( + int index) { + return kGOGFPODDLJ_.get(index); } - public static final int DIFFICULTY_FIELD_NUMBER = 7; - private int difficulty_; + public static final int MEMPKCGNNMF_FIELD_NUMBER = 4; + private int mEMPKCGNNMF_; /** - * uint32 difficulty = 7; - * @return The difficulty. + * uint32 MEMPKCGNNMF = 4; + * @return The mEMPKCGNNMF. */ @java.lang.Override - public int getDifficulty() { - return difficulty_; + public int getMEMPKCGNNMF() { + return mEMPKCGNNMF_; } - public static final int TEAM_INFO_LIST_FIELD_NUMBER = 2; - private java.util.List teamInfoList_; + public static final int PJJAOILBFBN_FIELD_NUMBER = 7; + private int pJJAOILBFBN_; /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * uint32 PJJAOILBFBN = 7; + * @return The pJJAOILBFBN. */ @java.lang.Override - public java.util.List getTeamInfoListList() { - return teamInfoList_; + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; } + + public static final int IS_NEW_RECORD_FIELD_NUMBER = 8; + private boolean isNewRecord_; /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * bool is_new_record = 8; + * @return The isNewRecord. */ @java.lang.Override - public java.util.List - getTeamInfoListOrBuilderList() { - return teamInfoList_; + public boolean getIsNewRecord() { + return isNewRecord_; } + + public static final int LCJICEEEKBI_FIELD_NUMBER = 9; + private com.google.protobuf.Internal.IntList lCJICEEEKBI_; /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated uint32 LCJICEEEKBI = 9; + * @return A list containing the lCJICEEEKBI. */ @java.lang.Override - public int getTeamInfoListCount() { - return teamInfoList_.size(); + public java.util.List + getLCJICEEEKBIList() { + return lCJICEEEKBI_; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated uint32 LCJICEEEKBI = 9; + * @return The count of lCJICEEEKBI. */ - @java.lang.Override - public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB getTeamInfoList(int index) { - return teamInfoList_.get(index); + public int getLCJICEEEKBICount() { + return lCJICEEEKBI_.size(); } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated uint32 LCJICEEEKBI = 9; + * @param index The index of the element to return. + * @return The lCJICEEEKBI at the given index. */ - @java.lang.Override - public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder getTeamInfoListOrBuilder( - int index) { - return teamInfoList_.get(index); + public int getLCJICEEEKBI(int index) { + return lCJICEEEKBI_.getInt(index); } + private int lCJICEEEKBIMemoizedSerializedSize = -1; private byte memoizedIsInitialized = -1; @java.lang.Override @@ -350,27 +346,27 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < teamInfoList_.size(); i++) { - output.writeMessage(2, teamInfoList_.get(i)); + if (dMNLDPPGOKG_ != 0) { + output.writeUInt32(1, dMNLDPPGOKG_); } - if (levelId_ != 0) { - output.writeUInt32(4, levelId_); + for (int i = 0; i < kGOGFPODDLJ_.size(); i++) { + output.writeMessage(3, kGOGFPODDLJ_.get(i)); } - if (difficulty_ != 0) { - output.writeUInt32(7, difficulty_); + if (mEMPKCGNNMF_ != 0) { + output.writeUInt32(4, mEMPKCGNNMF_); } - if (isNewRecord_ != false) { - output.writeBool(12, isNewRecord_); + if (pJJAOILBFBN_ != 0) { + output.writeUInt32(7, pJJAOILBFBN_); } - if (stageId_ != 0) { - output.writeUInt32(14, stageId_); + if (isNewRecord_ != false) { + output.writeBool(8, isNewRecord_); } - if (getAJFIDJINPLLList().size() > 0) { - output.writeUInt32NoTag(122); - output.writeUInt32NoTag(aJFIDJINPLLMemoizedSerializedSize); + if (getLCJICEEEKBIList().size() > 0) { + output.writeUInt32NoTag(74); + output.writeUInt32NoTag(lCJICEEEKBIMemoizedSerializedSize); } - for (int i = 0; i < aJFIDJINPLL_.size(); i++) { - output.writeUInt32NoTag(aJFIDJINPLL_.getInt(i)); + for (int i = 0; i < lCJICEEEKBI_.size(); i++) { + output.writeUInt32NoTag(lCJICEEEKBI_.getInt(i)); } unknownFields.writeTo(output); } @@ -381,39 +377,39 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < teamInfoList_.size(); i++) { + if (dMNLDPPGOKG_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, teamInfoList_.get(i)); + .computeUInt32Size(1, dMNLDPPGOKG_); } - if (levelId_ != 0) { + for (int i = 0; i < kGOGFPODDLJ_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, levelId_); + .computeMessageSize(3, kGOGFPODDLJ_.get(i)); } - if (difficulty_ != 0) { + if (mEMPKCGNNMF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, difficulty_); + .computeUInt32Size(4, mEMPKCGNNMF_); } - if (isNewRecord_ != false) { + if (pJJAOILBFBN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(12, isNewRecord_); + .computeUInt32Size(7, pJJAOILBFBN_); } - if (stageId_ != 0) { + if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, stageId_); + .computeBoolSize(8, isNewRecord_); } { int dataSize = 0; - for (int i = 0; i < aJFIDJINPLL_.size(); i++) { + for (int i = 0; i < lCJICEEEKBI_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(aJFIDJINPLL_.getInt(i)); + .computeUInt32SizeNoTag(lCJICEEEKBI_.getInt(i)); } size += dataSize; - if (!getAJFIDJINPLLList().isEmpty()) { + if (!getLCJICEEEKBIList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - aJFIDJINPLLMemoizedSerializedSize = dataSize; + lCJICEEEKBIMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -430,18 +426,18 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo other = (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) obj; - if (!getAJFIDJINPLLList() - .equals(other.getAJFIDJINPLLList())) return false; + if (getDMNLDPPGOKG() + != other.getDMNLDPPGOKG()) return false; + if (!getKGOGFPODDLJList() + .equals(other.getKGOGFPODDLJList())) return false; + if (getMEMPKCGNNMF() + != other.getMEMPKCGNNMF()) return false; + if (getPJJAOILBFBN() + != other.getPJJAOILBFBN()) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; - if (getStageId() - != other.getStageId()) return false; - if (getLevelId() - != other.getLevelId()) return false; - if (getDifficulty() - != other.getDifficulty()) return false; - if (!getTeamInfoListList() - .equals(other.getTeamInfoListList())) return false; + if (!getLCJICEEEKBIList() + .equals(other.getLCJICEEEKBIList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -453,22 +449,22 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getAJFIDJINPLLCount() > 0) { - hash = (37 * hash) + AJFIDJINPLL_FIELD_NUMBER; - hash = (53 * hash) + getAJFIDJINPLLList().hashCode(); - } + hash = (37 * hash) + DMNLDPPGOKG_FIELD_NUMBER; + hash = (53 * hash) + getDMNLDPPGOKG(); + if (getKGOGFPODDLJCount() > 0) { + hash = (37 * hash) + KGOGFPODDLJ_FIELD_NUMBER; + hash = (53 * hash) + getKGOGFPODDLJList().hashCode(); + } + hash = (37 * hash) + MEMPKCGNNMF_FIELD_NUMBER; + hash = (53 * hash) + getMEMPKCGNNMF(); + hash = (37 * hash) + PJJAOILBFBN_FIELD_NUMBER; + hash = (53 * hash) + getPJJAOILBFBN(); hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); - hash = (37 * hash) + STAGE_ID_FIELD_NUMBER; - hash = (53 * hash) + getStageId(); - hash = (37 * hash) + LEVEL_ID_FIELD_NUMBER; - hash = (53 * hash) + getLevelId(); - hash = (37 * hash) + DIFFICULTY_FIELD_NUMBER; - hash = (53 * hash) + getDifficulty(); - if (getTeamInfoListCount() > 0) { - hash = (37 * hash) + TEAM_INFO_LIST_FIELD_NUMBER; - hash = (53 * hash) + getTeamInfoListList().hashCode(); + if (getLCJICEEEKBICount() > 0) { + hash = (37 * hash) + LCJICEEEKBI_FIELD_NUMBER; + hash = (53 * hash) + getLCJICEEEKBIList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -566,10 +562,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: BHIDAAPPGHP
-     *
- * * Protobuf type {@code MultiCharacterDungeonSettleInfo} */ public static final class Builder extends @@ -602,28 +594,28 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getTeamInfoListFieldBuilder(); + getKGOGFPODDLJFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - aJFIDJINPLL_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - isNewRecord_ = false; + dMNLDPPGOKG_ = 0; - stageId_ = 0; + if (kGOGFPODDLJBuilder_ == null) { + kGOGFPODDLJ_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + kGOGFPODDLJBuilder_.clear(); + } + mEMPKCGNNMF_ = 0; - levelId_ = 0; + pJJAOILBFBN_ = 0; - difficulty_ = 0; + isNewRecord_ = false; - if (teamInfoListBuilder_ == null) { - teamInfoList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); - } else { - teamInfoListBuilder_.clear(); - } + lCJICEEEKBI_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -651,24 +643,24 @@ public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.Multi public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo buildPartial() { emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo result = new emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) != 0)) { - aJFIDJINPLL_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.aJFIDJINPLL_ = aJFIDJINPLL_; - result.isNewRecord_ = isNewRecord_; - result.stageId_ = stageId_; - result.levelId_ = levelId_; - result.difficulty_ = difficulty_; - if (teamInfoListBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { - teamInfoList_ = java.util.Collections.unmodifiableList(teamInfoList_); - bitField0_ = (bitField0_ & ~0x00000002); + result.dMNLDPPGOKG_ = dMNLDPPGOKG_; + if (kGOGFPODDLJBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + kGOGFPODDLJ_ = java.util.Collections.unmodifiableList(kGOGFPODDLJ_); + bitField0_ = (bitField0_ & ~0x00000001); } - result.teamInfoList_ = teamInfoList_; + result.kGOGFPODDLJ_ = kGOGFPODDLJ_; } else { - result.teamInfoList_ = teamInfoListBuilder_.build(); + result.kGOGFPODDLJ_ = kGOGFPODDLJBuilder_.build(); + } + result.mEMPKCGNNMF_ = mEMPKCGNNMF_; + result.pJJAOILBFBN_ = pJJAOILBFBN_; + result.isNewRecord_ = isNewRecord_; + if (((bitField0_ & 0x00000002) != 0)) { + lCJICEEEKBI_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000002); } + result.lCJICEEEKBI_ = lCJICEEEKBI_; onBuilt(); return result; } @@ -717,54 +709,54 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo other) { if (other == emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance()) return this; - if (!other.aJFIDJINPLL_.isEmpty()) { - if (aJFIDJINPLL_.isEmpty()) { - aJFIDJINPLL_ = other.aJFIDJINPLL_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureAJFIDJINPLLIsMutable(); - aJFIDJINPLL_.addAll(other.aJFIDJINPLL_); - } - onChanged(); - } - if (other.getIsNewRecord() != false) { - setIsNewRecord(other.getIsNewRecord()); - } - if (other.getStageId() != 0) { - setStageId(other.getStageId()); - } - if (other.getLevelId() != 0) { - setLevelId(other.getLevelId()); + if (other.getDMNLDPPGOKG() != 0) { + setDMNLDPPGOKG(other.getDMNLDPPGOKG()); } - if (other.getDifficulty() != 0) { - setDifficulty(other.getDifficulty()); - } - if (teamInfoListBuilder_ == null) { - if (!other.teamInfoList_.isEmpty()) { - if (teamInfoList_.isEmpty()) { - teamInfoList_ = other.teamInfoList_; - bitField0_ = (bitField0_ & ~0x00000002); + if (kGOGFPODDLJBuilder_ == null) { + if (!other.kGOGFPODDLJ_.isEmpty()) { + if (kGOGFPODDLJ_.isEmpty()) { + kGOGFPODDLJ_ = other.kGOGFPODDLJ_; + bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureTeamInfoListIsMutable(); - teamInfoList_.addAll(other.teamInfoList_); + ensureKGOGFPODDLJIsMutable(); + kGOGFPODDLJ_.addAll(other.kGOGFPODDLJ_); } onChanged(); } } else { - if (!other.teamInfoList_.isEmpty()) { - if (teamInfoListBuilder_.isEmpty()) { - teamInfoListBuilder_.dispose(); - teamInfoListBuilder_ = null; - teamInfoList_ = other.teamInfoList_; - bitField0_ = (bitField0_ & ~0x00000002); - teamInfoListBuilder_ = + if (!other.kGOGFPODDLJ_.isEmpty()) { + if (kGOGFPODDLJBuilder_.isEmpty()) { + kGOGFPODDLJBuilder_.dispose(); + kGOGFPODDLJBuilder_ = null; + kGOGFPODDLJ_ = other.kGOGFPODDLJ_; + bitField0_ = (bitField0_ & ~0x00000001); + kGOGFPODDLJBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getTeamInfoListFieldBuilder() : null; + getKGOGFPODDLJFieldBuilder() : null; } else { - teamInfoListBuilder_.addAllMessages(other.teamInfoList_); + kGOGFPODDLJBuilder_.addAllMessages(other.kGOGFPODDLJ_); } } } + if (other.getMEMPKCGNNMF() != 0) { + setMEMPKCGNNMF(other.getMEMPKCGNNMF()); + } + if (other.getPJJAOILBFBN() != 0) { + setPJJAOILBFBN(other.getPJJAOILBFBN()); + } + if (other.getIsNewRecord() != false) { + setIsNewRecord(other.getIsNewRecord()); + } + if (!other.lCJICEEEKBI_.isEmpty()) { + if (lCJICEEEKBI_.isEmpty()) { + lCJICEEEKBI_ = other.lCJICEEEKBI_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureLCJICEEEKBIIsMutable(); + lCJICEEEKBI_.addAll(other.lCJICEEEKBI_); + } + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -795,447 +787,447 @@ public Builder mergeFrom( } private int bitField0_; - private com.google.protobuf.Internal.IntList aJFIDJINPLL_ = emptyIntList(); - private void ensureAJFIDJINPLLIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - aJFIDJINPLL_ = mutableCopy(aJFIDJINPLL_); - bitField0_ |= 0x00000001; - } - } + private int dMNLDPPGOKG_ ; /** - * repeated uint32 AJFIDJINPLL = 15; - * @return A list containing the aJFIDJINPLL. - */ - public java.util.List - getAJFIDJINPLLList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(aJFIDJINPLL_) : aJFIDJINPLL_; - } - /** - * repeated uint32 AJFIDJINPLL = 15; - * @return The count of aJFIDJINPLL. - */ - public int getAJFIDJINPLLCount() { - return aJFIDJINPLL_.size(); - } - /** - * repeated uint32 AJFIDJINPLL = 15; - * @param index The index of the element to return. - * @return The aJFIDJINPLL at the given index. - */ - public int getAJFIDJINPLL(int index) { - return aJFIDJINPLL_.getInt(index); - } - /** - * repeated uint32 AJFIDJINPLL = 15; - * @param index The index to set the value at. - * @param value The aJFIDJINPLL to set. - * @return This builder for chaining. - */ - public Builder setAJFIDJINPLL( - int index, int value) { - ensureAJFIDJINPLLIsMutable(); - aJFIDJINPLL_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 AJFIDJINPLL = 15; - * @param value The aJFIDJINPLL to add. - * @return This builder for chaining. - */ - public Builder addAJFIDJINPLL(int value) { - ensureAJFIDJINPLLIsMutable(); - aJFIDJINPLL_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 AJFIDJINPLL = 15; - * @param values The aJFIDJINPLL to add. - * @return This builder for chaining. - */ - public Builder addAllAJFIDJINPLL( - java.lang.Iterable values) { - ensureAJFIDJINPLLIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, aJFIDJINPLL_); - onChanged(); - return this; - } - /** - * repeated uint32 AJFIDJINPLL = 15; - * @return This builder for chaining. - */ - public Builder clearAJFIDJINPLL() { - aJFIDJINPLL_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } - - private boolean isNewRecord_ ; - /** - * bool is_new_record = 12; - * @return The isNewRecord. + * uint32 DMNLDPPGOKG = 1; + * @return The dMNLDPPGOKG. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getDMNLDPPGOKG() { + return dMNLDPPGOKG_; } /** - * bool is_new_record = 12; - * @param value The isNewRecord to set. + * uint32 DMNLDPPGOKG = 1; + * @param value The dMNLDPPGOKG to set. * @return This builder for chaining. */ - public Builder setIsNewRecord(boolean value) { + public Builder setDMNLDPPGOKG(int value) { - isNewRecord_ = value; + dMNLDPPGOKG_ = value; onChanged(); return this; } /** - * bool is_new_record = 12; + * uint32 DMNLDPPGOKG = 1; * @return This builder for chaining. */ - public Builder clearIsNewRecord() { + public Builder clearDMNLDPPGOKG() { - isNewRecord_ = false; + dMNLDPPGOKG_ = 0; onChanged(); return this; } - private int stageId_ ; - /** - * uint32 stage_id = 14; - * @return The stageId. - */ - @java.lang.Override - public int getStageId() { - return stageId_; - } - /** - * uint32 stage_id = 14; - * @param value The stageId to set. - * @return This builder for chaining. - */ - public Builder setStageId(int value) { - - stageId_ = value; - onChanged(); - return this; - } - /** - * uint32 stage_id = 14; - * @return This builder for chaining. - */ - public Builder clearStageId() { - - stageId_ = 0; - onChanged(); - return this; - } - - private int levelId_ ; - /** - * uint32 level_id = 4; - * @return The levelId. - */ - @java.lang.Override - public int getLevelId() { - return levelId_; - } - /** - * uint32 level_id = 4; - * @param value The levelId to set. - * @return This builder for chaining. - */ - public Builder setLevelId(int value) { - - levelId_ = value; - onChanged(); - return this; - } - /** - * uint32 level_id = 4; - * @return This builder for chaining. - */ - public Builder clearLevelId() { - - levelId_ = 0; - onChanged(); - return this; - } - - private int difficulty_ ; - /** - * uint32 difficulty = 7; - * @return The difficulty. - */ - @java.lang.Override - public int getDifficulty() { - return difficulty_; - } - /** - * uint32 difficulty = 7; - * @param value The difficulty to set. - * @return This builder for chaining. - */ - public Builder setDifficulty(int value) { - - difficulty_ = value; - onChanged(); - return this; - } - /** - * uint32 difficulty = 7; - * @return This builder for chaining. - */ - public Builder clearDifficulty() { - - difficulty_ = 0; - onChanged(); - return this; - } - - private java.util.List teamInfoList_ = + private java.util.List kGOGFPODDLJ_ = java.util.Collections.emptyList(); - private void ensureTeamInfoListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - teamInfoList_ = new java.util.ArrayList(teamInfoList_); - bitField0_ |= 0x00000002; + private void ensureKGOGFPODDLJIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + kGOGFPODDLJ_ = new java.util.ArrayList(kGOGFPODDLJ_); + bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder> teamInfoListBuilder_; + emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder> kGOGFPODDLJBuilder_; /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public java.util.List getTeamInfoListList() { - if (teamInfoListBuilder_ == null) { - return java.util.Collections.unmodifiableList(teamInfoList_); + public java.util.List getKGOGFPODDLJList() { + if (kGOGFPODDLJBuilder_ == null) { + return java.util.Collections.unmodifiableList(kGOGFPODDLJ_); } else { - return teamInfoListBuilder_.getMessageList(); + return kGOGFPODDLJBuilder_.getMessageList(); } } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public int getTeamInfoListCount() { - if (teamInfoListBuilder_ == null) { - return teamInfoList_.size(); + public int getKGOGFPODDLJCount() { + if (kGOGFPODDLJBuilder_ == null) { + return kGOGFPODDLJ_.size(); } else { - return teamInfoListBuilder_.getCount(); + return kGOGFPODDLJBuilder_.getCount(); } } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB getTeamInfoList(int index) { - if (teamInfoListBuilder_ == null) { - return teamInfoList_.get(index); + public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB getKGOGFPODDLJ(int index) { + if (kGOGFPODDLJBuilder_ == null) { + return kGOGFPODDLJ_.get(index); } else { - return teamInfoListBuilder_.getMessage(index); + return kGOGFPODDLJBuilder_.getMessage(index); } } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder setTeamInfoList( + public Builder setKGOGFPODDLJ( int index, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB value) { - if (teamInfoListBuilder_ == null) { + if (kGOGFPODDLJBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureTeamInfoListIsMutable(); - teamInfoList_.set(index, value); + ensureKGOGFPODDLJIsMutable(); + kGOGFPODDLJ_.set(index, value); onChanged(); } else { - teamInfoListBuilder_.setMessage(index, value); + kGOGFPODDLJBuilder_.setMessage(index, value); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder setTeamInfoList( + public Builder setKGOGFPODDLJ( int index, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder builderForValue) { - if (teamInfoListBuilder_ == null) { - ensureTeamInfoListIsMutable(); - teamInfoList_.set(index, builderForValue.build()); + if (kGOGFPODDLJBuilder_ == null) { + ensureKGOGFPODDLJIsMutable(); + kGOGFPODDLJ_.set(index, builderForValue.build()); onChanged(); } else { - teamInfoListBuilder_.setMessage(index, builderForValue.build()); + kGOGFPODDLJBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder addTeamInfoList(emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB value) { - if (teamInfoListBuilder_ == null) { + public Builder addKGOGFPODDLJ(emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB value) { + if (kGOGFPODDLJBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureTeamInfoListIsMutable(); - teamInfoList_.add(value); + ensureKGOGFPODDLJIsMutable(); + kGOGFPODDLJ_.add(value); onChanged(); } else { - teamInfoListBuilder_.addMessage(value); + kGOGFPODDLJBuilder_.addMessage(value); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder addTeamInfoList( + public Builder addKGOGFPODDLJ( int index, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB value) { - if (teamInfoListBuilder_ == null) { + if (kGOGFPODDLJBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureTeamInfoListIsMutable(); - teamInfoList_.add(index, value); + ensureKGOGFPODDLJIsMutable(); + kGOGFPODDLJ_.add(index, value); onChanged(); } else { - teamInfoListBuilder_.addMessage(index, value); + kGOGFPODDLJBuilder_.addMessage(index, value); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder addTeamInfoList( + public Builder addKGOGFPODDLJ( emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder builderForValue) { - if (teamInfoListBuilder_ == null) { - ensureTeamInfoListIsMutable(); - teamInfoList_.add(builderForValue.build()); + if (kGOGFPODDLJBuilder_ == null) { + ensureKGOGFPODDLJIsMutable(); + kGOGFPODDLJ_.add(builderForValue.build()); onChanged(); } else { - teamInfoListBuilder_.addMessage(builderForValue.build()); + kGOGFPODDLJBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder addTeamInfoList( + public Builder addKGOGFPODDLJ( int index, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder builderForValue) { - if (teamInfoListBuilder_ == null) { - ensureTeamInfoListIsMutable(); - teamInfoList_.add(index, builderForValue.build()); + if (kGOGFPODDLJBuilder_ == null) { + ensureKGOGFPODDLJIsMutable(); + kGOGFPODDLJ_.add(index, builderForValue.build()); onChanged(); } else { - teamInfoListBuilder_.addMessage(index, builderForValue.build()); + kGOGFPODDLJBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder addAllTeamInfoList( + public Builder addAllKGOGFPODDLJ( java.lang.Iterable values) { - if (teamInfoListBuilder_ == null) { - ensureTeamInfoListIsMutable(); + if (kGOGFPODDLJBuilder_ == null) { + ensureKGOGFPODDLJIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, teamInfoList_); + values, kGOGFPODDLJ_); onChanged(); } else { - teamInfoListBuilder_.addAllMessages(values); + kGOGFPODDLJBuilder_.addAllMessages(values); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder clearTeamInfoList() { - if (teamInfoListBuilder_ == null) { - teamInfoList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + public Builder clearKGOGFPODDLJ() { + if (kGOGFPODDLJBuilder_ == null) { + kGOGFPODDLJ_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - teamInfoListBuilder_.clear(); + kGOGFPODDLJBuilder_.clear(); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public Builder removeTeamInfoList(int index) { - if (teamInfoListBuilder_ == null) { - ensureTeamInfoListIsMutable(); - teamInfoList_.remove(index); + public Builder removeKGOGFPODDLJ(int index) { + if (kGOGFPODDLJBuilder_ == null) { + ensureKGOGFPODDLJIsMutable(); + kGOGFPODDLJ_.remove(index); onChanged(); } else { - teamInfoListBuilder_.remove(index); + kGOGFPODDLJBuilder_.remove(index); } return this; } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder getTeamInfoListBuilder( + public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder getKGOGFPODDLJBuilder( int index) { - return getTeamInfoListFieldBuilder().getBuilder(index); + return getKGOGFPODDLJFieldBuilder().getBuilder(index); } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder getTeamInfoListOrBuilder( + public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder getKGOGFPODDLJOrBuilder( int index) { - if (teamInfoListBuilder_ == null) { - return teamInfoList_.get(index); } else { - return teamInfoListBuilder_.getMessageOrBuilder(index); + if (kGOGFPODDLJBuilder_ == null) { + return kGOGFPODDLJ_.get(index); } else { + return kGOGFPODDLJBuilder_.getMessageOrBuilder(index); } } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ public java.util.List - getTeamInfoListOrBuilderList() { - if (teamInfoListBuilder_ != null) { - return teamInfoListBuilder_.getMessageOrBuilderList(); + getKGOGFPODDLJOrBuilderList() { + if (kGOGFPODDLJBuilder_ != null) { + return kGOGFPODDLJBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(teamInfoList_); + return java.util.Collections.unmodifiableList(kGOGFPODDLJ_); } } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder addTeamInfoListBuilder() { - return getTeamInfoListFieldBuilder().addBuilder( + public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder addKGOGFPODDLJBuilder() { + return getKGOGFPODDLJFieldBuilder().addBuilder( emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.getDefaultInstance()); } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ - public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder addTeamInfoListBuilder( + public emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder addKGOGFPODDLJBuilder( int index) { - return getTeamInfoListFieldBuilder().addBuilder( + return getKGOGFPODDLJFieldBuilder().addBuilder( index, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.getDefaultInstance()); } /** - * repeated .IEDLOHFOJJB team_info_list = 2; + * repeated .IEDLOHFOJJB KGOGFPODDLJ = 3; */ public java.util.List - getTeamInfoListBuilderList() { - return getTeamInfoListFieldBuilder().getBuilderList(); + getKGOGFPODDLJBuilderList() { + return getKGOGFPODDLJFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder> - getTeamInfoListFieldBuilder() { - if (teamInfoListBuilder_ == null) { - teamInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + getKGOGFPODDLJFieldBuilder() { + if (kGOGFPODDLJBuilder_ == null) { + kGOGFPODDLJBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJB.Builder, emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.IEDLOHFOJJBOrBuilder>( - teamInfoList_, - ((bitField0_ & 0x00000002) != 0), + kGOGFPODDLJ_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - teamInfoList_ = null; + kGOGFPODDLJ_ = null; } - return teamInfoListBuilder_; + return kGOGFPODDLJBuilder_; + } + + private int mEMPKCGNNMF_ ; + /** + * uint32 MEMPKCGNNMF = 4; + * @return The mEMPKCGNNMF. + */ + @java.lang.Override + public int getMEMPKCGNNMF() { + return mEMPKCGNNMF_; + } + /** + * uint32 MEMPKCGNNMF = 4; + * @param value The mEMPKCGNNMF to set. + * @return This builder for chaining. + */ + public Builder setMEMPKCGNNMF(int value) { + + mEMPKCGNNMF_ = value; + onChanged(); + return this; + } + /** + * uint32 MEMPKCGNNMF = 4; + * @return This builder for chaining. + */ + public Builder clearMEMPKCGNNMF() { + + mEMPKCGNNMF_ = 0; + onChanged(); + return this; + } + + private int pJJAOILBFBN_ ; + /** + * uint32 PJJAOILBFBN = 7; + * @return The pJJAOILBFBN. + */ + @java.lang.Override + public int getPJJAOILBFBN() { + return pJJAOILBFBN_; + } + /** + * uint32 PJJAOILBFBN = 7; + * @param value The pJJAOILBFBN to set. + * @return This builder for chaining. + */ + public Builder setPJJAOILBFBN(int value) { + + pJJAOILBFBN_ = value; + onChanged(); + return this; + } + /** + * uint32 PJJAOILBFBN = 7; + * @return This builder for chaining. + */ + public Builder clearPJJAOILBFBN() { + + pJJAOILBFBN_ = 0; + onChanged(); + return this; + } + + private boolean isNewRecord_ ; + /** + * bool is_new_record = 8; + * @return The isNewRecord. + */ + @java.lang.Override + public boolean getIsNewRecord() { + return isNewRecord_; + } + /** + * bool is_new_record = 8; + * @param value The isNewRecord to set. + * @return This builder for chaining. + */ + public Builder setIsNewRecord(boolean value) { + + isNewRecord_ = value; + onChanged(); + return this; + } + /** + * bool is_new_record = 8; + * @return This builder for chaining. + */ + public Builder clearIsNewRecord() { + + isNewRecord_ = false; + onChanged(); + return this; + } + + private com.google.protobuf.Internal.IntList lCJICEEEKBI_ = emptyIntList(); + private void ensureLCJICEEEKBIIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + lCJICEEEKBI_ = mutableCopy(lCJICEEEKBI_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated uint32 LCJICEEEKBI = 9; + * @return A list containing the lCJICEEEKBI. + */ + public java.util.List + getLCJICEEEKBIList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(lCJICEEEKBI_) : lCJICEEEKBI_; + } + /** + * repeated uint32 LCJICEEEKBI = 9; + * @return The count of lCJICEEEKBI. + */ + public int getLCJICEEEKBICount() { + return lCJICEEEKBI_.size(); + } + /** + * repeated uint32 LCJICEEEKBI = 9; + * @param index The index of the element to return. + * @return The lCJICEEEKBI at the given index. + */ + public int getLCJICEEEKBI(int index) { + return lCJICEEEKBI_.getInt(index); + } + /** + * repeated uint32 LCJICEEEKBI = 9; + * @param index The index to set the value at. + * @param value The lCJICEEEKBI to set. + * @return This builder for chaining. + */ + public Builder setLCJICEEEKBI( + int index, int value) { + ensureLCJICEEEKBIIsMutable(); + lCJICEEEKBI_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 LCJICEEEKBI = 9; + * @param value The lCJICEEEKBI to add. + * @return This builder for chaining. + */ + public Builder addLCJICEEEKBI(int value) { + ensureLCJICEEEKBIIsMutable(); + lCJICEEEKBI_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 LCJICEEEKBI = 9; + * @param values The lCJICEEEKBI to add. + * @return This builder for chaining. + */ + public Builder addAllLCJICEEEKBI( + java.lang.Iterable values) { + ensureLCJICEEEKBIIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, lCJICEEEKBI_); + onChanged(); + return this; + } + /** + * repeated uint32 LCJICEEEKBI = 9; + * @return This builder for chaining. + */ + public Builder clearLCJICEEEKBI() { + lCJICEEEKBI_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; } @java.lang.Override public final Builder setUnknownFields( @@ -1305,12 +1297,12 @@ public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.Multi static { java.lang.String[] descriptorData = { "\n%MultiCharacterDungeonSettleInfo.proto\032" + - "\021IEDLOHFOJJB.proto\"\253\001\n\037MultiCharacterDun" + - "geonSettleInfo\022\023\n\013AJFIDJINPLL\030\017 \003(\r\022\025\n\ri" + - "s_new_record\030\014 \001(\010\022\020\n\010stage_id\030\016 \001(\r\022\020\n\010" + - "level_id\030\004 \001(\r\022\022\n\ndifficulty\030\007 \001(\r\022$\n\016te" + - "am_info_list\030\002 \003(\0132\014.IEDLOHFOJJBB\033\n\031emu." + - "grasscutter.net.protob\006proto3" + "\021IEDLOHFOJJB.proto\"\257\001\n\037MultiCharacterDun" + + "geonSettleInfo\022\023\n\013DMNLDPPGOKG\030\001 \001(\r\022!\n\013K" + + "GOGFPODDLJ\030\003 \003(\0132\014.IEDLOHFOJJB\022\023\n\013MEMPKC" + + "GNNMF\030\004 \001(\r\022\023\n\013PJJAOILBFBN\030\007 \001(\r\022\025\n\ris_n" + + "ew_record\030\010 \001(\010\022\023\n\013LCJICEEEKBI\030\t \003(\rB\033\n\031" + + "emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1322,7 +1314,7 @@ public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.Multi internal_static_MultiCharacterDungeonSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MultiCharacterDungeonSettleInfo_descriptor, - new java.lang.String[] { "AJFIDJINPLL", "IsNewRecord", "StageId", "LevelId", "Difficulty", "TeamInfoList", }); + new java.lang.String[] { "DMNLDPPGOKG", "KGOGFPODDLJ", "MEMPKCGNNMF", "PJJAOILBFBN", "IsNewRecord", "LCJICEEEKBI", }); emu.grasscutter.net.proto.IEDLOHFOJJBOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameSettleReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameSettleReqOuterClass.java index 7c7f39c1ef4..45784c92716 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameSettleReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameSettleReqOuterClass.java @@ -19,139 +19,139 @@ public interface MusicGameSettleReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 correct_hit = 7; - * @return The correctHit. + * repeated uint32 CFKPLNKHFKN = 32; + * @return A list containing the cFKPLNKHFKN. */ - int getCorrectHit(); + java.util.List getCFKPLNKHFKNList(); + /** + * repeated uint32 CFKPLNKHFKN = 32; + * @return The count of cFKPLNKHFKN. + */ + int getCFKPLNKHFKNCount(); + /** + * repeated uint32 CFKPLNKHFKN = 32; + * @param index The index of the element to return. + * @return The cFKPLNKHFKN at the given index. + */ + int getCFKPLNKHFKN(int index); /** - * repeated uint32 OEAHADEGEOA = 327; - * @return A list containing the oEAHADEGEOA. + * repeated uint32 NNFBHPJCONO = 5; + * @return A list containing the nNFBHPJCONO. */ - java.util.List getOEAHADEGEOAList(); + java.util.List getNNFBHPJCONOList(); /** - * repeated uint32 OEAHADEGEOA = 327; - * @return The count of oEAHADEGEOA. + * repeated uint32 NNFBHPJCONO = 5; + * @return The count of nNFBHPJCONO. */ - int getOEAHADEGEOACount(); + int getNNFBHPJCONOCount(); /** - * repeated uint32 OEAHADEGEOA = 327; + * repeated uint32 NNFBHPJCONO = 5; * @param index The index of the element to return. - * @return The oEAHADEGEOA at the given index. + * @return The nNFBHPJCONO at the given index. */ - int getOEAHADEGEOA(int index); + int getNNFBHPJCONO(int index); /** - * uint64 ugc_guid = 1; - * @return The ugcGuid. + * float speed = 454; + * @return The speed. */ - long getUgcGuid(); + float getSpeed(); /** - * bool BPNLLFDJJOL = 1200; - * @return The bPNLLFDJJOL. + * uint32 JPEGLEBNIGL = 1402; + * @return The jPEGLEBNIGL. */ - boolean getBPNLLFDJJOL(); + int getJPEGLEBNIGL(); /** - * uint32 score = 8; - * @return The score. + * uint32 GIKJKDBLFAD = 870; + * @return The gIKJKDBLFAD. */ - int getScore(); + int getGIKJKDBLFAD(); /** - * uint32 MECALGKAKJK = 14; - * @return The mECALGKAKJK. + * uint32 score = 12; + * @return The score. */ - int getMECALGKAKJK(); + int getScore(); /** - * uint32 max_combo = 2; - * @return The maxCombo. + * uint32 music_basic_id = 3; + * @return The musicBasicId. */ - int getMaxCombo(); + int getMusicBasicId(); /** - * repeated uint32 KPPICEDHMPN = 5; - * @return A list containing the kPPICEDHMPN. + * uint32 JJKIBHBPPPO = 929; + * @return The jJKIBHBPPPO. */ - java.util.List getKPPICEDHMPNList(); + int getJJKIBHBPPPO(); + /** - * repeated uint32 KPPICEDHMPN = 5; - * @return The count of kPPICEDHMPN. + * uint32 CLCABCNLGFM = 2; + * @return The cLCABCNLGFM. */ - int getKPPICEDHMPNCount(); + int getCLCABCNLGFM(); + /** - * repeated uint32 KPPICEDHMPN = 5; - * @param index The index of the element to return. - * @return The kPPICEDHMPN at the given index. + * uint32 max_combo = 8; + * @return The maxCombo. */ - int getKPPICEDHMPN(int index); + int getMaxCombo(); /** - * float speed = 1628; - * @return The speed. + * uint32 correct_hit = 13; + * @return The correctHit. */ - float getSpeed(); + int getCorrectHit(); /** - * uint32 KDAOEDCLEFG = 1749; - * @return The kDAOEDCLEFG. + * bool HKJPCJFLNFJ = 1722; + * @return The hKJPCJFLNFJ. */ - int getKDAOEDCLEFG(); + boolean getHKJPCJFLNFJ(); /** - * bool is_save_score = 6; + * bool is_save_score = 14; * @return The isSaveScore. */ boolean getIsSaveScore(); /** - * bool MAMHOPGFOKD = 1198; - * @return The mAMHOPGFOKD. + * bool OEDCPFGAKAM = 515; + * @return The oEDCPFGAKAM. */ - boolean getMAMHOPGFOKD(); + boolean getOEDCPFGAKAM(); /** - * uint32 NMPPJPOJFDC = 4; - * @return The nMPPJPOJFDC. + * uint32 BHPGPLPCNPL = 9; + * @return The bHPGPLPCNPL. */ - int getNMPPJPOJFDC(); + int getBHPGPLPCNPL(); /** - * uint32 music_basic_id = 11; - * @return The musicBasicId. + * uint64 ugc_guid = 15; + * @return The ugcGuid. */ - int getMusicBasicId(); + long getUgcGuid(); /** - * uint32 combo = 9; + * uint32 combo = 4; * @return The combo. */ int getCombo(); /** - * uint32 NGALDEAEBHG = 15; - * @return The nGALDEAEBHG. - */ - int getNGALDEAEBHG(); - - /** - * uint32 FCFNKIDLDHJ = 938; - * @return The fCFNKIDLDHJ. + * uint32 ABOAGOKKIEA = 1; + * @return The aBOAGOKKIEA. */ - int getFCFNKIDLDHJ(); - - /** - * uint32 GDOMKIHOKCC = 747; - * @return The gDOMKIHOKCC. - */ - int getGDOMKIHOKCC(); + int getABOAGOKKIEA(); } /** * 
-   * CmdId: 24309
-   * Obf: IOLEMBLHICB
+   * CmdId: 7153
+   * obf: OHGDJOBNKHE
    *
* * Protobuf type {@code MusicGameSettleReq} @@ -166,8 +166,8 @@ private MusicGameSettleReq(com.google.protobuf.GeneratedMessageV3.Builder bui super(builder); } private MusicGameSettleReq() { - oEAHADEGEOA_ = emptyIntList(); - kPPICEDHMPN_ = emptyIntList(); + cFKPLNKHFKN_ = emptyIntList(); + nNFBHPJCONO_ = emptyIntList(); } @java.lang.Override @@ -203,124 +203,124 @@ private MusicGameSettleReq( break; case 8: { - ugcGuid_ = input.readUInt64(); + aBOAGOKKIEA_ = input.readUInt32(); break; } case 16: { - maxCombo_ = input.readUInt32(); + cLCABCNLGFM_ = input.readUInt32(); + break; + } + case 24: { + + musicBasicId_ = input.readUInt32(); break; } case 32: { - nMPPJPOJFDC_ = input.readUInt32(); + combo_ = input.readUInt32(); break; } case 40: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - kPPICEDHMPN_ = newIntList(); + nNFBHPJCONO_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - kPPICEDHMPN_.addInt(input.readUInt32()); + nNFBHPJCONO_.addInt(input.readUInt32()); break; } case 42: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - kPPICEDHMPN_ = newIntList(); + nNFBHPJCONO_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - kPPICEDHMPN_.addInt(input.readUInt32()); + nNFBHPJCONO_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 48: { + case 64: { - isSaveScore_ = input.readBool(); + maxCombo_ = input.readUInt32(); break; } - case 56: { + case 72: { - correctHit_ = input.readUInt32(); + bHPGPLPCNPL_ = input.readUInt32(); break; } - case 64: { + case 96: { score_ = input.readUInt32(); break; } - case 72: { + case 104: { - combo_ = input.readUInt32(); - break; - } - case 88: { - - musicBasicId_ = input.readUInt32(); + correctHit_ = input.readUInt32(); break; } case 112: { - mECALGKAKJK_ = input.readUInt32(); + isSaveScore_ = input.readBool(); break; } case 120: { - nGALDEAEBHG_ = input.readUInt32(); + ugcGuid_ = input.readUInt64(); break; } - case 2616: { + case 256: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - oEAHADEGEOA_ = newIntList(); + cFKPLNKHFKN_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - oEAHADEGEOA_.addInt(input.readUInt32()); + cFKPLNKHFKN_.addInt(input.readUInt32()); break; } - case 2618: { + case 258: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - oEAHADEGEOA_ = newIntList(); + cFKPLNKHFKN_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - oEAHADEGEOA_.addInt(input.readUInt32()); + cFKPLNKHFKN_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 5976: { + case 3637: { - gDOMKIHOKCC_ = input.readUInt32(); + speed_ = input.readFloat(); break; } - case 7504: { + case 4120: { - fCFNKIDLDHJ_ = input.readUInt32(); + oEDCPFGAKAM_ = input.readBool(); break; } - case 9584: { + case 6960: { - mAMHOPGFOKD_ = input.readBool(); + gIKJKDBLFAD_ = input.readUInt32(); break; } - case 9600: { + case 7432: { - bPNLLFDJJOL_ = input.readBool(); + jJKIBHBPPPO_ = input.readUInt32(); break; } - case 13029: { + case 11216: { - speed_ = input.readFloat(); + jPEGLEBNIGL_ = input.readUInt32(); break; } - case 13992: { + case 13776: { - kDAOEDCLEFG_ = input.readUInt32(); + hKJPCJFLNFJ_ = input.readBool(); break; } default: { @@ -339,10 +339,10 @@ private MusicGameSettleReq( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000002) != 0)) { - kPPICEDHMPN_.makeImmutable(); // C + nNFBHPJCONO_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000001) != 0)) { - oEAHADEGEOA_.makeImmutable(); // C + cFKPLNKHFKN_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -361,71 +361,99 @@ private MusicGameSettleReq( emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq.class, emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq.Builder.class); } - public static final int CORRECT_HIT_FIELD_NUMBER = 7; - private int correctHit_; + public static final int CFKPLNKHFKN_FIELD_NUMBER = 32; + private com.google.protobuf.Internal.IntList cFKPLNKHFKN_; /** - * uint32 correct_hit = 7; - * @return The correctHit. + * repeated uint32 CFKPLNKHFKN = 32; + * @return A list containing the cFKPLNKHFKN. */ @java.lang.Override - public int getCorrectHit() { - return correctHit_; + public java.util.List + getCFKPLNKHFKNList() { + return cFKPLNKHFKN_; } + /** + * repeated uint32 CFKPLNKHFKN = 32; + * @return The count of cFKPLNKHFKN. + */ + public int getCFKPLNKHFKNCount() { + return cFKPLNKHFKN_.size(); + } + /** + * repeated uint32 CFKPLNKHFKN = 32; + * @param index The index of the element to return. + * @return The cFKPLNKHFKN at the given index. + */ + public int getCFKPLNKHFKN(int index) { + return cFKPLNKHFKN_.getInt(index); + } + private int cFKPLNKHFKNMemoizedSerializedSize = -1; - public static final int OEAHADEGEOA_FIELD_NUMBER = 327; - private com.google.protobuf.Internal.IntList oEAHADEGEOA_; + public static final int NNFBHPJCONO_FIELD_NUMBER = 5; + private com.google.protobuf.Internal.IntList nNFBHPJCONO_; /** - * repeated uint32 OEAHADEGEOA = 327; - * @return A list containing the oEAHADEGEOA. + * repeated uint32 NNFBHPJCONO = 5; + * @return A list containing the nNFBHPJCONO. */ @java.lang.Override public java.util.List - getOEAHADEGEOAList() { - return oEAHADEGEOA_; + getNNFBHPJCONOList() { + return nNFBHPJCONO_; } /** - * repeated uint32 OEAHADEGEOA = 327; - * @return The count of oEAHADEGEOA. + * repeated uint32 NNFBHPJCONO = 5; + * @return The count of nNFBHPJCONO. */ - public int getOEAHADEGEOACount() { - return oEAHADEGEOA_.size(); + public int getNNFBHPJCONOCount() { + return nNFBHPJCONO_.size(); } /** - * repeated uint32 OEAHADEGEOA = 327; + * repeated uint32 NNFBHPJCONO = 5; * @param index The index of the element to return. - * @return The oEAHADEGEOA at the given index. + * @return The nNFBHPJCONO at the given index. */ - public int getOEAHADEGEOA(int index) { - return oEAHADEGEOA_.getInt(index); + public int getNNFBHPJCONO(int index) { + return nNFBHPJCONO_.getInt(index); } - private int oEAHADEGEOAMemoizedSerializedSize = -1; + private int nNFBHPJCONOMemoizedSerializedSize = -1; - public static final int UGC_GUID_FIELD_NUMBER = 1; - private long ugcGuid_; + public static final int SPEED_FIELD_NUMBER = 454; + private float speed_; /** - * uint64 ugc_guid = 1; - * @return The ugcGuid. + * float speed = 454; + * @return The speed. */ @java.lang.Override - public long getUgcGuid() { - return ugcGuid_; + public float getSpeed() { + return speed_; } - public static final int BPNLLFDJJOL_FIELD_NUMBER = 1200; - private boolean bPNLLFDJJOL_; + public static final int JPEGLEBNIGL_FIELD_NUMBER = 1402; + private int jPEGLEBNIGL_; /** - * bool BPNLLFDJJOL = 1200; - * @return The bPNLLFDJJOL. + * uint32 JPEGLEBNIGL = 1402; + * @return The jPEGLEBNIGL. */ @java.lang.Override - public boolean getBPNLLFDJJOL() { - return bPNLLFDJJOL_; + public int getJPEGLEBNIGL() { + return jPEGLEBNIGL_; } - public static final int SCORE_FIELD_NUMBER = 8; + public static final int GIKJKDBLFAD_FIELD_NUMBER = 870; + private int gIKJKDBLFAD_; + /** + * uint32 GIKJKDBLFAD = 870; + * @return The gIKJKDBLFAD. + */ + @java.lang.Override + public int getGIKJKDBLFAD() { + return gIKJKDBLFAD_; + } + + public static final int SCORE_FIELD_NUMBER = 12; private int score_; /** - * uint32 score = 8; + * uint32 score = 12; * @return The score. */ @java.lang.Override @@ -433,82 +461,76 @@ public int getScore() { return score_; } - public static final int MECALGKAKJK_FIELD_NUMBER = 14; - private int mECALGKAKJK_; + public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 3; + private int musicBasicId_; /** - * uint32 MECALGKAKJK = 14; - * @return The mECALGKAKJK. + * uint32 music_basic_id = 3; + * @return The musicBasicId. */ @java.lang.Override - public int getMECALGKAKJK() { - return mECALGKAKJK_; + public int getMusicBasicId() { + return musicBasicId_; } - public static final int MAX_COMBO_FIELD_NUMBER = 2; - private int maxCombo_; + public static final int JJKIBHBPPPO_FIELD_NUMBER = 929; + private int jJKIBHBPPPO_; /** - * uint32 max_combo = 2; - * @return The maxCombo. + * uint32 JJKIBHBPPPO = 929; + * @return The jJKIBHBPPPO. */ @java.lang.Override - public int getMaxCombo() { - return maxCombo_; + public int getJJKIBHBPPPO() { + return jJKIBHBPPPO_; } - public static final int KPPICEDHMPN_FIELD_NUMBER = 5; - private com.google.protobuf.Internal.IntList kPPICEDHMPN_; + public static final int CLCABCNLGFM_FIELD_NUMBER = 2; + private int cLCABCNLGFM_; /** - * repeated uint32 KPPICEDHMPN = 5; - * @return A list containing the kPPICEDHMPN. + * uint32 CLCABCNLGFM = 2; + * @return The cLCABCNLGFM. */ @java.lang.Override - public java.util.List - getKPPICEDHMPNList() { - return kPPICEDHMPN_; - } - /** - * repeated uint32 KPPICEDHMPN = 5; - * @return The count of kPPICEDHMPN. - */ - public int getKPPICEDHMPNCount() { - return kPPICEDHMPN_.size(); + public int getCLCABCNLGFM() { + return cLCABCNLGFM_; } + + public static final int MAX_COMBO_FIELD_NUMBER = 8; + private int maxCombo_; /** - * repeated uint32 KPPICEDHMPN = 5; - * @param index The index of the element to return. - * @return The kPPICEDHMPN at the given index. + * uint32 max_combo = 8; + * @return The maxCombo. */ - public int getKPPICEDHMPN(int index) { - return kPPICEDHMPN_.getInt(index); + @java.lang.Override + public int getMaxCombo() { + return maxCombo_; } - private int kPPICEDHMPNMemoizedSerializedSize = -1; - public static final int SPEED_FIELD_NUMBER = 1628; - private float speed_; + public static final int CORRECT_HIT_FIELD_NUMBER = 13; + private int correctHit_; /** - * float speed = 1628; - * @return The speed. + * uint32 correct_hit = 13; + * @return The correctHit. */ @java.lang.Override - public float getSpeed() { - return speed_; + public int getCorrectHit() { + return correctHit_; } - public static final int KDAOEDCLEFG_FIELD_NUMBER = 1749; - private int kDAOEDCLEFG_; + public static final int HKJPCJFLNFJ_FIELD_NUMBER = 1722; + private boolean hKJPCJFLNFJ_; /** - * uint32 KDAOEDCLEFG = 1749; - * @return The kDAOEDCLEFG. + * bool HKJPCJFLNFJ = 1722; + * @return The hKJPCJFLNFJ. */ @java.lang.Override - public int getKDAOEDCLEFG() { - return kDAOEDCLEFG_; + public boolean getHKJPCJFLNFJ() { + return hKJPCJFLNFJ_; } - public static final int IS_SAVE_SCORE_FIELD_NUMBER = 6; + public static final int IS_SAVE_SCORE_FIELD_NUMBER = 14; private boolean isSaveScore_; /** - * bool is_save_score = 6; + * bool is_save_score = 14; * @return The isSaveScore. */ @java.lang.Override @@ -516,43 +538,43 @@ public boolean getIsSaveScore() { return isSaveScore_; } - public static final int MAMHOPGFOKD_FIELD_NUMBER = 1198; - private boolean mAMHOPGFOKD_; + public static final int OEDCPFGAKAM_FIELD_NUMBER = 515; + private boolean oEDCPFGAKAM_; /** - * bool MAMHOPGFOKD = 1198; - * @return The mAMHOPGFOKD. + * bool OEDCPFGAKAM = 515; + * @return The oEDCPFGAKAM. */ @java.lang.Override - public boolean getMAMHOPGFOKD() { - return mAMHOPGFOKD_; + public boolean getOEDCPFGAKAM() { + return oEDCPFGAKAM_; } - public static final int NMPPJPOJFDC_FIELD_NUMBER = 4; - private int nMPPJPOJFDC_; + public static final int BHPGPLPCNPL_FIELD_NUMBER = 9; + private int bHPGPLPCNPL_; /** - * uint32 NMPPJPOJFDC = 4; - * @return The nMPPJPOJFDC. + * uint32 BHPGPLPCNPL = 9; + * @return The bHPGPLPCNPL. */ @java.lang.Override - public int getNMPPJPOJFDC() { - return nMPPJPOJFDC_; + public int getBHPGPLPCNPL() { + return bHPGPLPCNPL_; } - public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 11; - private int musicBasicId_; + public static final int UGC_GUID_FIELD_NUMBER = 15; + private long ugcGuid_; /** - * uint32 music_basic_id = 11; - * @return The musicBasicId. + * uint64 ugc_guid = 15; + * @return The ugcGuid. */ @java.lang.Override - public int getMusicBasicId() { - return musicBasicId_; + public long getUgcGuid() { + return ugcGuid_; } - public static final int COMBO_FIELD_NUMBER = 9; + public static final int COMBO_FIELD_NUMBER = 4; private int combo_; /** - * uint32 combo = 9; + * uint32 combo = 4; * @return The combo. */ @java.lang.Override @@ -560,37 +582,15 @@ public int getCombo() { return combo_; } - public static final int NGALDEAEBHG_FIELD_NUMBER = 15; - private int nGALDEAEBHG_; - /** - * uint32 NGALDEAEBHG = 15; - * @return The nGALDEAEBHG. - */ - @java.lang.Override - public int getNGALDEAEBHG() { - return nGALDEAEBHG_; - } - - public static final int FCFNKIDLDHJ_FIELD_NUMBER = 938; - private int fCFNKIDLDHJ_; + public static final int ABOAGOKKIEA_FIELD_NUMBER = 1; + private int aBOAGOKKIEA_; /** - * uint32 FCFNKIDLDHJ = 938; - * @return The fCFNKIDLDHJ. + * uint32 ABOAGOKKIEA = 1; + * @return The aBOAGOKKIEA. */ @java.lang.Override - public int getFCFNKIDLDHJ() { - return fCFNKIDLDHJ_; - } - - public static final int GDOMKIHOKCC_FIELD_NUMBER = 747; - private int gDOMKIHOKCC_; - /** - * uint32 GDOMKIHOKCC = 747; - * @return The gDOMKIHOKCC. - */ - @java.lang.Override - public int getGDOMKIHOKCC() { - return gDOMKIHOKCC_; + public int getABOAGOKKIEA() { + return aBOAGOKKIEA_; } private byte memoizedIsInitialized = -1; @@ -608,67 +608,67 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (ugcGuid_ != 0L) { - output.writeUInt64(1, ugcGuid_); + if (aBOAGOKKIEA_ != 0) { + output.writeUInt32(1, aBOAGOKKIEA_); } - if (maxCombo_ != 0) { - output.writeUInt32(2, maxCombo_); + if (cLCABCNLGFM_ != 0) { + output.writeUInt32(2, cLCABCNLGFM_); + } + if (musicBasicId_ != 0) { + output.writeUInt32(3, musicBasicId_); } - if (nMPPJPOJFDC_ != 0) { - output.writeUInt32(4, nMPPJPOJFDC_); + if (combo_ != 0) { + output.writeUInt32(4, combo_); } - if (getKPPICEDHMPNList().size() > 0) { + if (getNNFBHPJCONOList().size() > 0) { output.writeUInt32NoTag(42); - output.writeUInt32NoTag(kPPICEDHMPNMemoizedSerializedSize); + output.writeUInt32NoTag(nNFBHPJCONOMemoizedSerializedSize); } - for (int i = 0; i < kPPICEDHMPN_.size(); i++) { - output.writeUInt32NoTag(kPPICEDHMPN_.getInt(i)); + for (int i = 0; i < nNFBHPJCONO_.size(); i++) { + output.writeUInt32NoTag(nNFBHPJCONO_.getInt(i)); } - if (isSaveScore_ != false) { - output.writeBool(6, isSaveScore_); + if (maxCombo_ != 0) { + output.writeUInt32(8, maxCombo_); } - if (correctHit_ != 0) { - output.writeUInt32(7, correctHit_); + if (bHPGPLPCNPL_ != 0) { + output.writeUInt32(9, bHPGPLPCNPL_); } if (score_ != 0) { - output.writeUInt32(8, score_); + output.writeUInt32(12, score_); } - if (combo_ != 0) { - output.writeUInt32(9, combo_); - } - if (musicBasicId_ != 0) { - output.writeUInt32(11, musicBasicId_); + if (correctHit_ != 0) { + output.writeUInt32(13, correctHit_); } - if (mECALGKAKJK_ != 0) { - output.writeUInt32(14, mECALGKAKJK_); + if (isSaveScore_ != false) { + output.writeBool(14, isSaveScore_); } - if (nGALDEAEBHG_ != 0) { - output.writeUInt32(15, nGALDEAEBHG_); + if (ugcGuid_ != 0L) { + output.writeUInt64(15, ugcGuid_); } - if (getOEAHADEGEOAList().size() > 0) { - output.writeUInt32NoTag(2618); - output.writeUInt32NoTag(oEAHADEGEOAMemoizedSerializedSize); + if (getCFKPLNKHFKNList().size() > 0) { + output.writeUInt32NoTag(258); + output.writeUInt32NoTag(cFKPLNKHFKNMemoizedSerializedSize); } - for (int i = 0; i < oEAHADEGEOA_.size(); i++) { - output.writeUInt32NoTag(oEAHADEGEOA_.getInt(i)); + for (int i = 0; i < cFKPLNKHFKN_.size(); i++) { + output.writeUInt32NoTag(cFKPLNKHFKN_.getInt(i)); } - if (gDOMKIHOKCC_ != 0) { - output.writeUInt32(747, gDOMKIHOKCC_); + if (speed_ != 0F) { + output.writeFloat(454, speed_); } - if (fCFNKIDLDHJ_ != 0) { - output.writeUInt32(938, fCFNKIDLDHJ_); + if (oEDCPFGAKAM_ != false) { + output.writeBool(515, oEDCPFGAKAM_); } - if (mAMHOPGFOKD_ != false) { - output.writeBool(1198, mAMHOPGFOKD_); + if (gIKJKDBLFAD_ != 0) { + output.writeUInt32(870, gIKJKDBLFAD_); } - if (bPNLLFDJJOL_ != false) { - output.writeBool(1200, bPNLLFDJJOL_); + if (jJKIBHBPPPO_ != 0) { + output.writeUInt32(929, jJKIBHBPPPO_); } - if (speed_ != 0F) { - output.writeFloat(1628, speed_); + if (jPEGLEBNIGL_ != 0) { + output.writeUInt32(1402, jPEGLEBNIGL_); } - if (kDAOEDCLEFG_ != 0) { - output.writeUInt32(1749, kDAOEDCLEFG_); + if (hKJPCJFLNFJ_ != false) { + output.writeBool(1722, hKJPCJFLNFJ_); } unknownFields.writeTo(output); } @@ -679,97 +679,97 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (ugcGuid_ != 0L) { + if (aBOAGOKKIEA_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(1, ugcGuid_); + .computeUInt32Size(1, aBOAGOKKIEA_); } - if (maxCombo_ != 0) { + if (cLCABCNLGFM_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(2, cLCABCNLGFM_); + } + if (musicBasicId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, maxCombo_); + .computeUInt32Size(3, musicBasicId_); } - if (nMPPJPOJFDC_ != 0) { + if (combo_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, nMPPJPOJFDC_); + .computeUInt32Size(4, combo_); } { int dataSize = 0; - for (int i = 0; i < kPPICEDHMPN_.size(); i++) { + for (int i = 0; i < nNFBHPJCONO_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(kPPICEDHMPN_.getInt(i)); + .computeUInt32SizeNoTag(nNFBHPJCONO_.getInt(i)); } size += dataSize; - if (!getKPPICEDHMPNList().isEmpty()) { + if (!getNNFBHPJCONOList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - kPPICEDHMPNMemoizedSerializedSize = dataSize; + nNFBHPJCONOMemoizedSerializedSize = dataSize; } - if (isSaveScore_ != false) { + if (maxCombo_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, isSaveScore_); + .computeUInt32Size(8, maxCombo_); } - if (correctHit_ != 0) { + if (bHPGPLPCNPL_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, correctHit_); + .computeUInt32Size(9, bHPGPLPCNPL_); } if (score_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, score_); + .computeUInt32Size(12, score_); } - if (combo_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, combo_); - } - if (musicBasicId_ != 0) { + if (correctHit_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, musicBasicId_); + .computeUInt32Size(13, correctHit_); } - if (mECALGKAKJK_ != 0) { + if (isSaveScore_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, mECALGKAKJK_); + .computeBoolSize(14, isSaveScore_); } - if (nGALDEAEBHG_ != 0) { + if (ugcGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, nGALDEAEBHG_); + .computeUInt64Size(15, ugcGuid_); } { int dataSize = 0; - for (int i = 0; i < oEAHADEGEOA_.size(); i++) { + for (int i = 0; i < cFKPLNKHFKN_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(oEAHADEGEOA_.getInt(i)); + .computeUInt32SizeNoTag(cFKPLNKHFKN_.getInt(i)); } size += dataSize; - if (!getOEAHADEGEOAList().isEmpty()) { + if (!getCFKPLNKHFKNList().isEmpty()) { size += 2; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - oEAHADEGEOAMemoizedSerializedSize = dataSize; + cFKPLNKHFKNMemoizedSerializedSize = dataSize; } - if (gDOMKIHOKCC_ != 0) { + if (speed_ != 0F) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(747, gDOMKIHOKCC_); + .computeFloatSize(454, speed_); } - if (fCFNKIDLDHJ_ != 0) { + if (oEDCPFGAKAM_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(938, fCFNKIDLDHJ_); + .computeBoolSize(515, oEDCPFGAKAM_); } - if (mAMHOPGFOKD_ != false) { + if (gIKJKDBLFAD_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1198, mAMHOPGFOKD_); + .computeUInt32Size(870, gIKJKDBLFAD_); } - if (bPNLLFDJJOL_ != false) { + if (jJKIBHBPPPO_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1200, bPNLLFDJJOL_); + .computeUInt32Size(929, jJKIBHBPPPO_); } - if (speed_ != 0F) { + if (jPEGLEBNIGL_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeFloatSize(1628, speed_); + .computeUInt32Size(1402, jPEGLEBNIGL_); } - if (kDAOEDCLEFG_ != 0) { + if (hKJPCJFLNFJ_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1749, kDAOEDCLEFG_); + .computeBoolSize(1722, hKJPCJFLNFJ_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -786,43 +786,43 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq other = (emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq) obj; - if (getCorrectHit() - != other.getCorrectHit()) return false; - if (!getOEAHADEGEOAList() - .equals(other.getOEAHADEGEOAList())) return false; - if (getUgcGuid() - != other.getUgcGuid()) return false; - if (getBPNLLFDJJOL() - != other.getBPNLLFDJJOL()) return false; + if (!getCFKPLNKHFKNList() + .equals(other.getCFKPLNKHFKNList())) return false; + if (!getNNFBHPJCONOList() + .equals(other.getNNFBHPJCONOList())) return false; + if (java.lang.Float.floatToIntBits(getSpeed()) + != java.lang.Float.floatToIntBits( + other.getSpeed())) return false; + if (getJPEGLEBNIGL() + != other.getJPEGLEBNIGL()) return false; + if (getGIKJKDBLFAD() + != other.getGIKJKDBLFAD()) return false; if (getScore() != other.getScore()) return false; - if (getMECALGKAKJK() - != other.getMECALGKAKJK()) return false; + if (getMusicBasicId() + != other.getMusicBasicId()) return false; + if (getJJKIBHBPPPO() + != other.getJJKIBHBPPPO()) return false; + if (getCLCABCNLGFM() + != other.getCLCABCNLGFM()) return false; if (getMaxCombo() != other.getMaxCombo()) return false; - if (!getKPPICEDHMPNList() - .equals(other.getKPPICEDHMPNList())) return false; - if (java.lang.Float.floatToIntBits(getSpeed()) - != java.lang.Float.floatToIntBits( - other.getSpeed())) return false; - if (getKDAOEDCLEFG() - != other.getKDAOEDCLEFG()) return false; + if (getCorrectHit() + != other.getCorrectHit()) return false; + if (getHKJPCJFLNFJ() + != other.getHKJPCJFLNFJ()) return false; if (getIsSaveScore() != other.getIsSaveScore()) return false; - if (getMAMHOPGFOKD() - != other.getMAMHOPGFOKD()) return false; - if (getNMPPJPOJFDC() - != other.getNMPPJPOJFDC()) return false; - if (getMusicBasicId() - != other.getMusicBasicId()) return false; + if (getOEDCPFGAKAM() + != other.getOEDCPFGAKAM()) return false; + if (getBHPGPLPCNPL() + != other.getBHPGPLPCNPL()) return false; + if (getUgcGuid() + != other.getUgcGuid()) return false; if (getCombo() != other.getCombo()) return false; - if (getNGALDEAEBHG() - != other.getNGALDEAEBHG()) return false; - if (getFCFNKIDLDHJ() - != other.getFCFNKIDLDHJ()) return false; - if (getGDOMKIHOKCC() - != other.getGDOMKIHOKCC()) return false; + if (getABOAGOKKIEA() + != other.getABOAGOKKIEA()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -834,51 +834,51 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + CORRECT_HIT_FIELD_NUMBER; - hash = (53 * hash) + getCorrectHit(); - if (getOEAHADEGEOACount() > 0) { - hash = (37 * hash) + OEAHADEGEOA_FIELD_NUMBER; - hash = (53 * hash) + getOEAHADEGEOAList().hashCode(); + if (getCFKPLNKHFKNCount() > 0) { + hash = (37 * hash) + CFKPLNKHFKN_FIELD_NUMBER; + hash = (53 * hash) + getCFKPLNKHFKNList().hashCode(); } - hash = (37 * hash) + UGC_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getUgcGuid()); - hash = (37 * hash) + BPNLLFDJJOL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getBPNLLFDJJOL()); - hash = (37 * hash) + SCORE_FIELD_NUMBER; - hash = (53 * hash) + getScore(); - hash = (37 * hash) + MECALGKAKJK_FIELD_NUMBER; - hash = (53 * hash) + getMECALGKAKJK(); - hash = (37 * hash) + MAX_COMBO_FIELD_NUMBER; - hash = (53 * hash) + getMaxCombo(); - if (getKPPICEDHMPNCount() > 0) { - hash = (37 * hash) + KPPICEDHMPN_FIELD_NUMBER; - hash = (53 * hash) + getKPPICEDHMPNList().hashCode(); + if (getNNFBHPJCONOCount() > 0) { + hash = (37 * hash) + NNFBHPJCONO_FIELD_NUMBER; + hash = (53 * hash) + getNNFBHPJCONOList().hashCode(); } hash = (37 * hash) + SPEED_FIELD_NUMBER; hash = (53 * hash) + java.lang.Float.floatToIntBits( getSpeed()); - hash = (37 * hash) + KDAOEDCLEFG_FIELD_NUMBER; - hash = (53 * hash) + getKDAOEDCLEFG(); + hash = (37 * hash) + JPEGLEBNIGL_FIELD_NUMBER; + hash = (53 * hash) + getJPEGLEBNIGL(); + hash = (37 * hash) + GIKJKDBLFAD_FIELD_NUMBER; + hash = (53 * hash) + getGIKJKDBLFAD(); + hash = (37 * hash) + SCORE_FIELD_NUMBER; + hash = (53 * hash) + getScore(); + hash = (37 * hash) + MUSIC_BASIC_ID_FIELD_NUMBER; + hash = (53 * hash) + getMusicBasicId(); + hash = (37 * hash) + JJKIBHBPPPO_FIELD_NUMBER; + hash = (53 * hash) + getJJKIBHBPPPO(); + hash = (37 * hash) + CLCABCNLGFM_FIELD_NUMBER; + hash = (53 * hash) + getCLCABCNLGFM(); + hash = (37 * hash) + MAX_COMBO_FIELD_NUMBER; + hash = (53 * hash) + getMaxCombo(); + hash = (37 * hash) + CORRECT_HIT_FIELD_NUMBER; + hash = (53 * hash) + getCorrectHit(); + hash = (37 * hash) + HKJPCJFLNFJ_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getHKJPCJFLNFJ()); hash = (37 * hash) + IS_SAVE_SCORE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSaveScore()); - hash = (37 * hash) + MAMHOPGFOKD_FIELD_NUMBER; + hash = (37 * hash) + OEDCPFGAKAM_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getMAMHOPGFOKD()); - hash = (37 * hash) + NMPPJPOJFDC_FIELD_NUMBER; - hash = (53 * hash) + getNMPPJPOJFDC(); - hash = (37 * hash) + MUSIC_BASIC_ID_FIELD_NUMBER; - hash = (53 * hash) + getMusicBasicId(); + getOEDCPFGAKAM()); + hash = (37 * hash) + BHPGPLPCNPL_FIELD_NUMBER; + hash = (53 * hash) + getBHPGPLPCNPL(); + hash = (37 * hash) + UGC_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getUgcGuid()); hash = (37 * hash) + COMBO_FIELD_NUMBER; hash = (53 * hash) + getCombo(); - hash = (37 * hash) + NGALDEAEBHG_FIELD_NUMBER; - hash = (53 * hash) + getNGALDEAEBHG(); - hash = (37 * hash) + FCFNKIDLDHJ_FIELD_NUMBER; - hash = (53 * hash) + getFCFNKIDLDHJ(); - hash = (37 * hash) + GDOMKIHOKCC_FIELD_NUMBER; - hash = (53 * hash) + getGDOMKIHOKCC(); + hash = (37 * hash) + ABOAGOKKIEA_FIELD_NUMBER; + hash = (53 * hash) + getABOAGOKKIEA(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -976,8 +976,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 24309
-     * Obf: IOLEMBLHICB
+     * CmdId: 7153
+     * obf: OHGDJOBNKHE
      *
* * Protobuf type {@code MusicGameSettleReq} @@ -1017,41 +1017,41 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - correctHit_ = 0; - - oEAHADEGEOA_ = emptyIntList(); + cFKPLNKHFKN_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - ugcGuid_ = 0L; + nNFBHPJCONO_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + speed_ = 0F; - bPNLLFDJJOL_ = false; + jPEGLEBNIGL_ = 0; + + gIKJKDBLFAD_ = 0; score_ = 0; - mECALGKAKJK_ = 0; + musicBasicId_ = 0; + + jJKIBHBPPPO_ = 0; + + cLCABCNLGFM_ = 0; maxCombo_ = 0; - kPPICEDHMPN_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); - speed_ = 0F; + correctHit_ = 0; - kDAOEDCLEFG_ = 0; + hKJPCJFLNFJ_ = false; isSaveScore_ = false; - mAMHOPGFOKD_ = false; + oEDCPFGAKAM_ = false; - nMPPJPOJFDC_ = 0; + bHPGPLPCNPL_ = 0; - musicBasicId_ = 0; + ugcGuid_ = 0L; combo_ = 0; - nGALDEAEBHG_ = 0; - - fCFNKIDLDHJ_ = 0; - - gDOMKIHOKCC_ = 0; + aBOAGOKKIEA_ = 0; return this; } @@ -1080,32 +1080,32 @@ public emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq public emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq buildPartial() { emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq result = new emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq(this); int from_bitField0_ = bitField0_; - result.correctHit_ = correctHit_; if (((bitField0_ & 0x00000001) != 0)) { - oEAHADEGEOA_.makeImmutable(); + cFKPLNKHFKN_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.oEAHADEGEOA_ = oEAHADEGEOA_; - result.ugcGuid_ = ugcGuid_; - result.bPNLLFDJJOL_ = bPNLLFDJJOL_; - result.score_ = score_; - result.mECALGKAKJK_ = mECALGKAKJK_; - result.maxCombo_ = maxCombo_; + result.cFKPLNKHFKN_ = cFKPLNKHFKN_; if (((bitField0_ & 0x00000002) != 0)) { - kPPICEDHMPN_.makeImmutable(); + nNFBHPJCONO_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.kPPICEDHMPN_ = kPPICEDHMPN_; + result.nNFBHPJCONO_ = nNFBHPJCONO_; result.speed_ = speed_; - result.kDAOEDCLEFG_ = kDAOEDCLEFG_; - result.isSaveScore_ = isSaveScore_; - result.mAMHOPGFOKD_ = mAMHOPGFOKD_; - result.nMPPJPOJFDC_ = nMPPJPOJFDC_; + result.jPEGLEBNIGL_ = jPEGLEBNIGL_; + result.gIKJKDBLFAD_ = gIKJKDBLFAD_; + result.score_ = score_; result.musicBasicId_ = musicBasicId_; + result.jJKIBHBPPPO_ = jJKIBHBPPPO_; + result.cLCABCNLGFM_ = cLCABCNLGFM_; + result.maxCombo_ = maxCombo_; + result.correctHit_ = correctHit_; + result.hKJPCJFLNFJ_ = hKJPCJFLNFJ_; + result.isSaveScore_ = isSaveScore_; + result.oEDCPFGAKAM_ = oEDCPFGAKAM_; + result.bHPGPLPCNPL_ = bHPGPLPCNPL_; + result.ugcGuid_ = ugcGuid_; result.combo_ = combo_; - result.nGALDEAEBHG_ = nGALDEAEBHG_; - result.fCFNKIDLDHJ_ = fCFNKIDLDHJ_; - result.gDOMKIHOKCC_ = gDOMKIHOKCC_; + result.aBOAGOKKIEA_ = aBOAGOKKIEA_; onBuilt(); return result; } @@ -1154,73 +1154,73 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq other) { if (other == emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq.getDefaultInstance()) return this; - if (other.getCorrectHit() != 0) { - setCorrectHit(other.getCorrectHit()); - } - if (!other.oEAHADEGEOA_.isEmpty()) { - if (oEAHADEGEOA_.isEmpty()) { - oEAHADEGEOA_ = other.oEAHADEGEOA_; + if (!other.cFKPLNKHFKN_.isEmpty()) { + if (cFKPLNKHFKN_.isEmpty()) { + cFKPLNKHFKN_ = other.cFKPLNKHFKN_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureOEAHADEGEOAIsMutable(); - oEAHADEGEOA_.addAll(other.oEAHADEGEOA_); + ensureCFKPLNKHFKNIsMutable(); + cFKPLNKHFKN_.addAll(other.cFKPLNKHFKN_); } onChanged(); } - if (other.getUgcGuid() != 0L) { - setUgcGuid(other.getUgcGuid()); + if (!other.nNFBHPJCONO_.isEmpty()) { + if (nNFBHPJCONO_.isEmpty()) { + nNFBHPJCONO_ = other.nNFBHPJCONO_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureNNFBHPJCONOIsMutable(); + nNFBHPJCONO_.addAll(other.nNFBHPJCONO_); + } + onChanged(); + } + if (other.getSpeed() != 0F) { + setSpeed(other.getSpeed()); + } + if (other.getJPEGLEBNIGL() != 0) { + setJPEGLEBNIGL(other.getJPEGLEBNIGL()); } - if (other.getBPNLLFDJJOL() != false) { - setBPNLLFDJJOL(other.getBPNLLFDJJOL()); + if (other.getGIKJKDBLFAD() != 0) { + setGIKJKDBLFAD(other.getGIKJKDBLFAD()); } if (other.getScore() != 0) { setScore(other.getScore()); } - if (other.getMECALGKAKJK() != 0) { - setMECALGKAKJK(other.getMECALGKAKJK()); + if (other.getMusicBasicId() != 0) { + setMusicBasicId(other.getMusicBasicId()); + } + if (other.getJJKIBHBPPPO() != 0) { + setJJKIBHBPPPO(other.getJJKIBHBPPPO()); + } + if (other.getCLCABCNLGFM() != 0) { + setCLCABCNLGFM(other.getCLCABCNLGFM()); } if (other.getMaxCombo() != 0) { setMaxCombo(other.getMaxCombo()); } - if (!other.kPPICEDHMPN_.isEmpty()) { - if (kPPICEDHMPN_.isEmpty()) { - kPPICEDHMPN_ = other.kPPICEDHMPN_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureKPPICEDHMPNIsMutable(); - kPPICEDHMPN_.addAll(other.kPPICEDHMPN_); - } - onChanged(); - } - if (other.getSpeed() != 0F) { - setSpeed(other.getSpeed()); + if (other.getCorrectHit() != 0) { + setCorrectHit(other.getCorrectHit()); } - if (other.getKDAOEDCLEFG() != 0) { - setKDAOEDCLEFG(other.getKDAOEDCLEFG()); + if (other.getHKJPCJFLNFJ() != false) { + setHKJPCJFLNFJ(other.getHKJPCJFLNFJ()); } if (other.getIsSaveScore() != false) { setIsSaveScore(other.getIsSaveScore()); } - if (other.getMAMHOPGFOKD() != false) { - setMAMHOPGFOKD(other.getMAMHOPGFOKD()); + if (other.getOEDCPFGAKAM() != false) { + setOEDCPFGAKAM(other.getOEDCPFGAKAM()); } - if (other.getNMPPJPOJFDC() != 0) { - setNMPPJPOJFDC(other.getNMPPJPOJFDC()); + if (other.getBHPGPLPCNPL() != 0) { + setBHPGPLPCNPL(other.getBHPGPLPCNPL()); } - if (other.getMusicBasicId() != 0) { - setMusicBasicId(other.getMusicBasicId()); + if (other.getUgcGuid() != 0L) { + setUgcGuid(other.getUgcGuid()); } if (other.getCombo() != 0) { setCombo(other.getCombo()); } - if (other.getNGALDEAEBHG() != 0) { - setNGALDEAEBHG(other.getNGALDEAEBHG()); - } - if (other.getFCFNKIDLDHJ() != 0) { - setFCFNKIDLDHJ(other.getFCFNKIDLDHJ()); - } - if (other.getGDOMKIHOKCC() != 0) { - setGDOMKIHOKCC(other.getGDOMKIHOKCC()); + if (other.getABOAGOKKIEA() != 0) { + setABOAGOKKIEA(other.getABOAGOKKIEA()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1252,181 +1252,260 @@ public Builder mergeFrom( } private int bitField0_; - private int correctHit_ ; + private com.google.protobuf.Internal.IntList cFKPLNKHFKN_ = emptyIntList(); + private void ensureCFKPLNKHFKNIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + cFKPLNKHFKN_ = mutableCopy(cFKPLNKHFKN_); + bitField0_ |= 0x00000001; + } + } /** - * uint32 correct_hit = 7; - * @return The correctHit. + * repeated uint32 CFKPLNKHFKN = 32; + * @return A list containing the cFKPLNKHFKN. */ - @java.lang.Override - public int getCorrectHit() { - return correctHit_; + public java.util.List + getCFKPLNKHFKNList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(cFKPLNKHFKN_) : cFKPLNKHFKN_; } /** - * uint32 correct_hit = 7; - * @param value The correctHit to set. + * repeated uint32 CFKPLNKHFKN = 32; + * @return The count of cFKPLNKHFKN. + */ + public int getCFKPLNKHFKNCount() { + return cFKPLNKHFKN_.size(); + } + /** + * repeated uint32 CFKPLNKHFKN = 32; + * @param index The index of the element to return. + * @return The cFKPLNKHFKN at the given index. + */ + public int getCFKPLNKHFKN(int index) { + return cFKPLNKHFKN_.getInt(index); + } + /** + * repeated uint32 CFKPLNKHFKN = 32; + * @param index The index to set the value at. + * @param value The cFKPLNKHFKN to set. * @return This builder for chaining. */ - public Builder setCorrectHit(int value) { - - correctHit_ = value; + public Builder setCFKPLNKHFKN( + int index, int value) { + ensureCFKPLNKHFKNIsMutable(); + cFKPLNKHFKN_.setInt(index, value); onChanged(); return this; } /** - * uint32 correct_hit = 7; + * repeated uint32 CFKPLNKHFKN = 32; + * @param value The cFKPLNKHFKN to add. * @return This builder for chaining. */ - public Builder clearCorrectHit() { - - correctHit_ = 0; + public Builder addCFKPLNKHFKN(int value) { + ensureCFKPLNKHFKNIsMutable(); + cFKPLNKHFKN_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 CFKPLNKHFKN = 32; + * @param values The cFKPLNKHFKN to add. + * @return This builder for chaining. + */ + public Builder addAllCFKPLNKHFKN( + java.lang.Iterable values) { + ensureCFKPLNKHFKNIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, cFKPLNKHFKN_); + onChanged(); + return this; + } + /** + * repeated uint32 CFKPLNKHFKN = 32; + * @return This builder for chaining. + */ + public Builder clearCFKPLNKHFKN() { + cFKPLNKHFKN_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } - private com.google.protobuf.Internal.IntList oEAHADEGEOA_ = emptyIntList(); - private void ensureOEAHADEGEOAIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - oEAHADEGEOA_ = mutableCopy(oEAHADEGEOA_); - bitField0_ |= 0x00000001; + private com.google.protobuf.Internal.IntList nNFBHPJCONO_ = emptyIntList(); + private void ensureNNFBHPJCONOIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + nNFBHPJCONO_ = mutableCopy(nNFBHPJCONO_); + bitField0_ |= 0x00000002; } } /** - * repeated uint32 OEAHADEGEOA = 327; - * @return A list containing the oEAHADEGEOA. + * repeated uint32 NNFBHPJCONO = 5; + * @return A list containing the nNFBHPJCONO. */ public java.util.List - getOEAHADEGEOAList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(oEAHADEGEOA_) : oEAHADEGEOA_; + getNNFBHPJCONOList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(nNFBHPJCONO_) : nNFBHPJCONO_; } /** - * repeated uint32 OEAHADEGEOA = 327; - * @return The count of oEAHADEGEOA. + * repeated uint32 NNFBHPJCONO = 5; + * @return The count of nNFBHPJCONO. */ - public int getOEAHADEGEOACount() { - return oEAHADEGEOA_.size(); + public int getNNFBHPJCONOCount() { + return nNFBHPJCONO_.size(); } /** - * repeated uint32 OEAHADEGEOA = 327; + * repeated uint32 NNFBHPJCONO = 5; * @param index The index of the element to return. - * @return The oEAHADEGEOA at the given index. + * @return The nNFBHPJCONO at the given index. */ - public int getOEAHADEGEOA(int index) { - return oEAHADEGEOA_.getInt(index); + public int getNNFBHPJCONO(int index) { + return nNFBHPJCONO_.getInt(index); } /** - * repeated uint32 OEAHADEGEOA = 327; + * repeated uint32 NNFBHPJCONO = 5; * @param index The index to set the value at. - * @param value The oEAHADEGEOA to set. + * @param value The nNFBHPJCONO to set. * @return This builder for chaining. */ - public Builder setOEAHADEGEOA( + public Builder setNNFBHPJCONO( int index, int value) { - ensureOEAHADEGEOAIsMutable(); - oEAHADEGEOA_.setInt(index, value); + ensureNNFBHPJCONOIsMutable(); + nNFBHPJCONO_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 OEAHADEGEOA = 327; - * @param value The oEAHADEGEOA to add. + * repeated uint32 NNFBHPJCONO = 5; + * @param value The nNFBHPJCONO to add. * @return This builder for chaining. */ - public Builder addOEAHADEGEOA(int value) { - ensureOEAHADEGEOAIsMutable(); - oEAHADEGEOA_.addInt(value); + public Builder addNNFBHPJCONO(int value) { + ensureNNFBHPJCONOIsMutable(); + nNFBHPJCONO_.addInt(value); onChanged(); return this; } /** - * repeated uint32 OEAHADEGEOA = 327; - * @param values The oEAHADEGEOA to add. + * repeated uint32 NNFBHPJCONO = 5; + * @param values The nNFBHPJCONO to add. * @return This builder for chaining. */ - public Builder addAllOEAHADEGEOA( + public Builder addAllNNFBHPJCONO( java.lang.Iterable values) { - ensureOEAHADEGEOAIsMutable(); + ensureNNFBHPJCONOIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, oEAHADEGEOA_); + values, nNFBHPJCONO_); onChanged(); return this; } /** - * repeated uint32 OEAHADEGEOA = 327; + * repeated uint32 NNFBHPJCONO = 5; * @return This builder for chaining. */ - public Builder clearOEAHADEGEOA() { - oEAHADEGEOA_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder clearNNFBHPJCONO() { + nNFBHPJCONO_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private long ugcGuid_ ; + private float speed_ ; /** - * uint64 ugc_guid = 1; - * @return The ugcGuid. + * float speed = 454; + * @return The speed. */ @java.lang.Override - public long getUgcGuid() { - return ugcGuid_; + public float getSpeed() { + return speed_; } /** - * uint64 ugc_guid = 1; - * @param value The ugcGuid to set. + * float speed = 454; + * @param value The speed to set. * @return This builder for chaining. */ - public Builder setUgcGuid(long value) { + public Builder setSpeed(float value) { - ugcGuid_ = value; + speed_ = value; onChanged(); return this; } /** - * uint64 ugc_guid = 1; + * float speed = 454; * @return This builder for chaining. */ - public Builder clearUgcGuid() { + public Builder clearSpeed() { - ugcGuid_ = 0L; + speed_ = 0F; + onChanged(); + return this; + } + + private int jPEGLEBNIGL_ ; + /** + * uint32 JPEGLEBNIGL = 1402; + * @return The jPEGLEBNIGL. + */ + @java.lang.Override + public int getJPEGLEBNIGL() { + return jPEGLEBNIGL_; + } + /** + * uint32 JPEGLEBNIGL = 1402; + * @param value The jPEGLEBNIGL to set. + * @return This builder for chaining. + */ + public Builder setJPEGLEBNIGL(int value) { + + jPEGLEBNIGL_ = value; + onChanged(); + return this; + } + /** + * uint32 JPEGLEBNIGL = 1402; + * @return This builder for chaining. + */ + public Builder clearJPEGLEBNIGL() { + + jPEGLEBNIGL_ = 0; onChanged(); return this; } - private boolean bPNLLFDJJOL_ ; + private int gIKJKDBLFAD_ ; /** - * bool BPNLLFDJJOL = 1200; - * @return The bPNLLFDJJOL. + * uint32 GIKJKDBLFAD = 870; + * @return The gIKJKDBLFAD. */ @java.lang.Override - public boolean getBPNLLFDJJOL() { - return bPNLLFDJJOL_; + public int getGIKJKDBLFAD() { + return gIKJKDBLFAD_; } /** - * bool BPNLLFDJJOL = 1200; - * @param value The bPNLLFDJJOL to set. + * uint32 GIKJKDBLFAD = 870; + * @param value The gIKJKDBLFAD to set. * @return This builder for chaining. */ - public Builder setBPNLLFDJJOL(boolean value) { + public Builder setGIKJKDBLFAD(int value) { - bPNLLFDJJOL_ = value; + gIKJKDBLFAD_ = value; onChanged(); return this; } /** - * bool BPNLLFDJJOL = 1200; + * uint32 GIKJKDBLFAD = 870; * @return This builder for chaining. */ - public Builder clearBPNLLFDJJOL() { + public Builder clearGIKJKDBLFAD() { - bPNLLFDJJOL_ = false; + gIKJKDBLFAD_ = 0; onChanged(); return this; } private int score_ ; /** - * uint32 score = 8; + * uint32 score = 12; * @return The score. */ @java.lang.Override @@ -1434,7 +1513,7 @@ public int getScore() { return score_; } /** - * uint32 score = 8; + * uint32 score = 12; * @param value The score to set. * @return This builder for chaining. */ @@ -1445,7 +1524,7 @@ public Builder setScore(int value) { return this; } /** - * uint32 score = 8; + * uint32 score = 12; * @return This builder for chaining. */ public Builder clearScore() { @@ -1455,212 +1534,195 @@ public Builder clearScore() { return this; } - private int mECALGKAKJK_ ; + private int musicBasicId_ ; /** - * uint32 MECALGKAKJK = 14; - * @return The mECALGKAKJK. + * uint32 music_basic_id = 3; + * @return The musicBasicId. */ @java.lang.Override - public int getMECALGKAKJK() { - return mECALGKAKJK_; + public int getMusicBasicId() { + return musicBasicId_; } /** - * uint32 MECALGKAKJK = 14; - * @param value The mECALGKAKJK to set. + * uint32 music_basic_id = 3; + * @param value The musicBasicId to set. * @return This builder for chaining. */ - public Builder setMECALGKAKJK(int value) { + public Builder setMusicBasicId(int value) { - mECALGKAKJK_ = value; + musicBasicId_ = value; onChanged(); return this; } /** - * uint32 MECALGKAKJK = 14; + * uint32 music_basic_id = 3; * @return This builder for chaining. */ - public Builder clearMECALGKAKJK() { + public Builder clearMusicBasicId() { - mECALGKAKJK_ = 0; + musicBasicId_ = 0; onChanged(); return this; } - private int maxCombo_ ; + private int jJKIBHBPPPO_ ; /** - * uint32 max_combo = 2; - * @return The maxCombo. + * uint32 JJKIBHBPPPO = 929; + * @return The jJKIBHBPPPO. */ @java.lang.Override - public int getMaxCombo() { - return maxCombo_; + public int getJJKIBHBPPPO() { + return jJKIBHBPPPO_; } /** - * uint32 max_combo = 2; - * @param value The maxCombo to set. + * uint32 JJKIBHBPPPO = 929; + * @param value The jJKIBHBPPPO to set. * @return This builder for chaining. */ - public Builder setMaxCombo(int value) { + public Builder setJJKIBHBPPPO(int value) { - maxCombo_ = value; + jJKIBHBPPPO_ = value; onChanged(); return this; } /** - * uint32 max_combo = 2; + * uint32 JJKIBHBPPPO = 929; * @return This builder for chaining. */ - public Builder clearMaxCombo() { + public Builder clearJJKIBHBPPPO() { - maxCombo_ = 0; + jJKIBHBPPPO_ = 0; onChanged(); return this; } - private com.google.protobuf.Internal.IntList kPPICEDHMPN_ = emptyIntList(); - private void ensureKPPICEDHMPNIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - kPPICEDHMPN_ = mutableCopy(kPPICEDHMPN_); - bitField0_ |= 0x00000002; - } - } - /** - * repeated uint32 KPPICEDHMPN = 5; - * @return A list containing the kPPICEDHMPN. - */ - public java.util.List - getKPPICEDHMPNList() { - return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(kPPICEDHMPN_) : kPPICEDHMPN_; - } - /** - * repeated uint32 KPPICEDHMPN = 5; - * @return The count of kPPICEDHMPN. - */ - public int getKPPICEDHMPNCount() { - return kPPICEDHMPN_.size(); - } + private int cLCABCNLGFM_ ; /** - * repeated uint32 KPPICEDHMPN = 5; - * @param index The index of the element to return. - * @return The kPPICEDHMPN at the given index. + * uint32 CLCABCNLGFM = 2; + * @return The cLCABCNLGFM. */ - public int getKPPICEDHMPN(int index) { - return kPPICEDHMPN_.getInt(index); + @java.lang.Override + public int getCLCABCNLGFM() { + return cLCABCNLGFM_; } /** - * repeated uint32 KPPICEDHMPN = 5; - * @param index The index to set the value at. - * @param value The kPPICEDHMPN to set. + * uint32 CLCABCNLGFM = 2; + * @param value The cLCABCNLGFM to set. * @return This builder for chaining. */ - public Builder setKPPICEDHMPN( - int index, int value) { - ensureKPPICEDHMPNIsMutable(); - kPPICEDHMPN_.setInt(index, value); + public Builder setCLCABCNLGFM(int value) { + + cLCABCNLGFM_ = value; onChanged(); return this; } /** - * repeated uint32 KPPICEDHMPN = 5; - * @param value The kPPICEDHMPN to add. + * uint32 CLCABCNLGFM = 2; * @return This builder for chaining. */ - public Builder addKPPICEDHMPN(int value) { - ensureKPPICEDHMPNIsMutable(); - kPPICEDHMPN_.addInt(value); + public Builder clearCLCABCNLGFM() { + + cLCABCNLGFM_ = 0; onChanged(); return this; } + + private int maxCombo_ ; + /** + * uint32 max_combo = 8; + * @return The maxCombo. + */ + @java.lang.Override + public int getMaxCombo() { + return maxCombo_; + } /** - * repeated uint32 KPPICEDHMPN = 5; - * @param values The kPPICEDHMPN to add. + * uint32 max_combo = 8; + * @param value The maxCombo to set. * @return This builder for chaining. */ - public Builder addAllKPPICEDHMPN( - java.lang.Iterable values) { - ensureKPPICEDHMPNIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kPPICEDHMPN_); + public Builder setMaxCombo(int value) { + + maxCombo_ = value; onChanged(); return this; } /** - * repeated uint32 KPPICEDHMPN = 5; + * uint32 max_combo = 8; * @return This builder for chaining. */ - public Builder clearKPPICEDHMPN() { - kPPICEDHMPN_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); + public Builder clearMaxCombo() { + + maxCombo_ = 0; onChanged(); return this; } - private float speed_ ; + private int correctHit_ ; /** - * float speed = 1628; - * @return The speed. + * uint32 correct_hit = 13; + * @return The correctHit. */ @java.lang.Override - public float getSpeed() { - return speed_; + public int getCorrectHit() { + return correctHit_; } /** - * float speed = 1628; - * @param value The speed to set. + * uint32 correct_hit = 13; + * @param value The correctHit to set. * @return This builder for chaining. */ - public Builder setSpeed(float value) { + public Builder setCorrectHit(int value) { - speed_ = value; + correctHit_ = value; onChanged(); return this; } /** - * float speed = 1628; + * uint32 correct_hit = 13; * @return This builder for chaining. */ - public Builder clearSpeed() { + public Builder clearCorrectHit() { - speed_ = 0F; + correctHit_ = 0; onChanged(); return this; } - private int kDAOEDCLEFG_ ; + private boolean hKJPCJFLNFJ_ ; /** - * uint32 KDAOEDCLEFG = 1749; - * @return The kDAOEDCLEFG. + * bool HKJPCJFLNFJ = 1722; + * @return The hKJPCJFLNFJ. */ @java.lang.Override - public int getKDAOEDCLEFG() { - return kDAOEDCLEFG_; + public boolean getHKJPCJFLNFJ() { + return hKJPCJFLNFJ_; } /** - * uint32 KDAOEDCLEFG = 1749; - * @param value The kDAOEDCLEFG to set. + * bool HKJPCJFLNFJ = 1722; + * @param value The hKJPCJFLNFJ to set. * @return This builder for chaining. */ - public Builder setKDAOEDCLEFG(int value) { + public Builder setHKJPCJFLNFJ(boolean value) { - kDAOEDCLEFG_ = value; + hKJPCJFLNFJ_ = value; onChanged(); return this; } /** - * uint32 KDAOEDCLEFG = 1749; + * bool HKJPCJFLNFJ = 1722; * @return This builder for chaining. */ - public Builder clearKDAOEDCLEFG() { + public Builder clearHKJPCJFLNFJ() { - kDAOEDCLEFG_ = 0; + hKJPCJFLNFJ_ = false; onChanged(); return this; } private boolean isSaveScore_ ; /** - * bool is_save_score = 6; + * bool is_save_score = 14; * @return The isSaveScore. */ @java.lang.Override @@ -1668,7 +1730,7 @@ public boolean getIsSaveScore() { return isSaveScore_; } /** - * bool is_save_score = 6; + * bool is_save_score = 14; * @param value The isSaveScore to set. * @return This builder for chaining. */ @@ -1679,7 +1741,7 @@ public Builder setIsSaveScore(boolean value) { return this; } /** - * bool is_save_score = 6; + * bool is_save_score = 14; * @return This builder for chaining. */ public Builder clearIsSaveScore() { @@ -1689,102 +1751,102 @@ public Builder clearIsSaveScore() { return this; } - private boolean mAMHOPGFOKD_ ; + private boolean oEDCPFGAKAM_ ; /** - * bool MAMHOPGFOKD = 1198; - * @return The mAMHOPGFOKD. + * bool OEDCPFGAKAM = 515; + * @return The oEDCPFGAKAM. */ @java.lang.Override - public boolean getMAMHOPGFOKD() { - return mAMHOPGFOKD_; + public boolean getOEDCPFGAKAM() { + return oEDCPFGAKAM_; } /** - * bool MAMHOPGFOKD = 1198; - * @param value The mAMHOPGFOKD to set. + * bool OEDCPFGAKAM = 515; + * @param value The oEDCPFGAKAM to set. * @return This builder for chaining. */ - public Builder setMAMHOPGFOKD(boolean value) { + public Builder setOEDCPFGAKAM(boolean value) { - mAMHOPGFOKD_ = value; + oEDCPFGAKAM_ = value; onChanged(); return this; } /** - * bool MAMHOPGFOKD = 1198; + * bool OEDCPFGAKAM = 515; * @return This builder for chaining. */ - public Builder clearMAMHOPGFOKD() { + public Builder clearOEDCPFGAKAM() { - mAMHOPGFOKD_ = false; + oEDCPFGAKAM_ = false; onChanged(); return this; } - private int nMPPJPOJFDC_ ; + private int bHPGPLPCNPL_ ; /** - * uint32 NMPPJPOJFDC = 4; - * @return The nMPPJPOJFDC. + * uint32 BHPGPLPCNPL = 9; + * @return The bHPGPLPCNPL. */ @java.lang.Override - public int getNMPPJPOJFDC() { - return nMPPJPOJFDC_; + public int getBHPGPLPCNPL() { + return bHPGPLPCNPL_; } /** - * uint32 NMPPJPOJFDC = 4; - * @param value The nMPPJPOJFDC to set. + * uint32 BHPGPLPCNPL = 9; + * @param value The bHPGPLPCNPL to set. * @return This builder for chaining. */ - public Builder setNMPPJPOJFDC(int value) { + public Builder setBHPGPLPCNPL(int value) { - nMPPJPOJFDC_ = value; + bHPGPLPCNPL_ = value; onChanged(); return this; } /** - * uint32 NMPPJPOJFDC = 4; + * uint32 BHPGPLPCNPL = 9; * @return This builder for chaining. */ - public Builder clearNMPPJPOJFDC() { + public Builder clearBHPGPLPCNPL() { - nMPPJPOJFDC_ = 0; + bHPGPLPCNPL_ = 0; onChanged(); return this; } - private int musicBasicId_ ; + private long ugcGuid_ ; /** - * uint32 music_basic_id = 11; - * @return The musicBasicId. + * uint64 ugc_guid = 15; + * @return The ugcGuid. */ @java.lang.Override - public int getMusicBasicId() { - return musicBasicId_; + public long getUgcGuid() { + return ugcGuid_; } /** - * uint32 music_basic_id = 11; - * @param value The musicBasicId to set. + * uint64 ugc_guid = 15; + * @param value The ugcGuid to set. * @return This builder for chaining. */ - public Builder setMusicBasicId(int value) { + public Builder setUgcGuid(long value) { - musicBasicId_ = value; + ugcGuid_ = value; onChanged(); return this; } /** - * uint32 music_basic_id = 11; + * uint64 ugc_guid = 15; * @return This builder for chaining. */ - public Builder clearMusicBasicId() { + public Builder clearUgcGuid() { - musicBasicId_ = 0; + ugcGuid_ = 0L; onChanged(); return this; } private int combo_ ; /** - * uint32 combo = 9; + * uint32 combo = 4; * @return The combo. */ @java.lang.Override @@ -1792,7 +1854,7 @@ public int getCombo() { return combo_; } /** - * uint32 combo = 9; + * uint32 combo = 4; * @param value The combo to set. * @return This builder for chaining. */ @@ -1803,7 +1865,7 @@ public Builder setCombo(int value) { return this; } /** - * uint32 combo = 9; + * uint32 combo = 4; * @return This builder for chaining. */ public Builder clearCombo() { @@ -1813,95 +1875,33 @@ public Builder clearCombo() { return this; } - private int nGALDEAEBHG_ ; - /** - * uint32 NGALDEAEBHG = 15; - * @return The nGALDEAEBHG. - */ - @java.lang.Override - public int getNGALDEAEBHG() { - return nGALDEAEBHG_; - } - /** - * uint32 NGALDEAEBHG = 15; - * @param value The nGALDEAEBHG to set. - * @return This builder for chaining. - */ - public Builder setNGALDEAEBHG(int value) { - - nGALDEAEBHG_ = value; - onChanged(); - return this; - } - /** - * uint32 NGALDEAEBHG = 15; - * @return This builder for chaining. - */ - public Builder clearNGALDEAEBHG() { - - nGALDEAEBHG_ = 0; - onChanged(); - return this; - } - - private int fCFNKIDLDHJ_ ; - /** - * uint32 FCFNKIDLDHJ = 938; - * @return The fCFNKIDLDHJ. - */ - @java.lang.Override - public int getFCFNKIDLDHJ() { - return fCFNKIDLDHJ_; - } - /** - * uint32 FCFNKIDLDHJ = 938; - * @param value The fCFNKIDLDHJ to set. - * @return This builder for chaining. - */ - public Builder setFCFNKIDLDHJ(int value) { - - fCFNKIDLDHJ_ = value; - onChanged(); - return this; - } - /** - * uint32 FCFNKIDLDHJ = 938; - * @return This builder for chaining. - */ - public Builder clearFCFNKIDLDHJ() { - - fCFNKIDLDHJ_ = 0; - onChanged(); - return this; - } - - private int gDOMKIHOKCC_ ; + private int aBOAGOKKIEA_ ; /** - * uint32 GDOMKIHOKCC = 747; - * @return The gDOMKIHOKCC. + * uint32 ABOAGOKKIEA = 1; + * @return The aBOAGOKKIEA. */ @java.lang.Override - public int getGDOMKIHOKCC() { - return gDOMKIHOKCC_; + public int getABOAGOKKIEA() { + return aBOAGOKKIEA_; } /** - * uint32 GDOMKIHOKCC = 747; - * @param value The gDOMKIHOKCC to set. + * uint32 ABOAGOKKIEA = 1; + * @param value The aBOAGOKKIEA to set. * @return This builder for chaining. */ - public Builder setGDOMKIHOKCC(int value) { + public Builder setABOAGOKKIEA(int value) { - gDOMKIHOKCC_ = value; + aBOAGOKKIEA_ = value; onChanged(); return this; } /** - * uint32 GDOMKIHOKCC = 747; + * uint32 ABOAGOKKIEA = 1; * @return This builder for chaining. */ - public Builder clearGDOMKIHOKCC() { + public Builder clearABOAGOKKIEA() { - gDOMKIHOKCC_ = 0; + aBOAGOKKIEA_ = 0; onChanged(); return this; } @@ -1972,18 +1972,18 @@ public emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq descriptor; static { java.lang.String[] descriptorData = { - "\n\030MusicGameSettleReq.proto\"\203\003\n\022MusicGame" + - "SettleReq\022\023\n\013correct_hit\030\007 \001(\r\022\024\n\013OEAHAD" + - "EGEOA\030\307\002 \003(\r\022\020\n\010ugc_guid\030\001 \001(\004\022\024\n\013BPNLLF" + - "DJJOL\030\260\t \001(\010\022\r\n\005score\030\010 \001(\r\022\023\n\013MECALGKAK" + - "JK\030\016 \001(\r\022\021\n\tmax_combo\030\002 \001(\r\022\023\n\013KPPICEDHM" + - "PN\030\005 \003(\r\022\016\n\005speed\030\334\014 \001(\002\022\024\n\013KDAOEDCLEFG\030" + - "\325\r \001(\r\022\025\n\ris_save_score\030\006 \001(\010\022\024\n\013MAMHOPG" + - "FOKD\030\256\t \001(\010\022\023\n\013NMPPJPOJFDC\030\004 \001(\r\022\026\n\016musi" + - "c_basic_id\030\013 \001(\r\022\r\n\005combo\030\t \001(\r\022\023\n\013NGALD" + - "EAEBHG\030\017 \001(\r\022\024\n\013FCFNKIDLDHJ\030\252\007 \001(\r\022\024\n\013GD" + - "OMKIHOKCC\030\353\005 \001(\rB\033\n\031emu.grasscutter.net." + - "protob\006proto3" + "\n\030MusicGameSettleReq.proto\"\202\003\n\022MusicGame" + + "SettleReq\022\023\n\013CFKPLNKHFKN\030 \003(\r\022\023\n\013NNFBHP" + + "JCONO\030\005 \003(\r\022\016\n\005speed\030\306\003 \001(\002\022\024\n\013JPEGLEBNI" + + "GL\030\372\n \001(\r\022\024\n\013GIKJKDBLFAD\030\346\006 \001(\r\022\r\n\005score" + + "\030\014 \001(\r\022\026\n\016music_basic_id\030\003 \001(\r\022\024\n\013JJKIBH" + + "BPPPO\030\241\007 \001(\r\022\023\n\013CLCABCNLGFM\030\002 \001(\r\022\021\n\tmax" + + "_combo\030\010 \001(\r\022\023\n\013correct_hit\030\r \001(\r\022\024\n\013HKJ" + + "PCJFLNFJ\030\272\r \001(\010\022\025\n\ris_save_score\030\016 \001(\010\022\024" + + "\n\013OEDCPFGAKAM\030\203\004 \001(\010\022\023\n\013BHPGPLPCNPL\030\t \001(" + + "\r\022\020\n\010ugc_guid\030\017 \001(\004\022\r\n\005combo\030\004 \001(\r\022\023\n\013AB" + + "OAGOKKIEA\030\001 \001(\rB\033\n\031emu.grasscutter.net.p" + + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1994,7 +1994,7 @@ public emu.grasscutter.net.proto.MusicGameSettleReqOuterClass.MusicGameSettleReq internal_static_MusicGameSettleReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MusicGameSettleReq_descriptor, - new java.lang.String[] { "CorrectHit", "OEAHADEGEOA", "UgcGuid", "BPNLLFDJJOL", "Score", "MECALGKAKJK", "MaxCombo", "KPPICEDHMPN", "Speed", "KDAOEDCLEFG", "IsSaveScore", "MAMHOPGFOKD", "NMPPJPOJFDC", "MusicBasicId", "Combo", "NGALDEAEBHG", "FCFNKIDLDHJ", "GDOMKIHOKCC", }); + new java.lang.String[] { "CFKPLNKHFKN", "NNFBHPJCONO", "Speed", "JPEGLEBNIGL", "GIKJKDBLFAD", "Score", "MusicBasicId", "JJKIBHBPPPO", "CLCABCNLGFM", "MaxCombo", "CorrectHit", "HKJPCJFLNFJ", "IsSaveScore", "OEDCPFGAKAM", "BHPGPLPCNPL", "UgcGuid", "Combo", "ABOAGOKKIEA", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameSettleRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameSettleRspOuterClass.java index edbf7819245..0e8077ebc74 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameSettleRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameSettleRspOuterClass.java @@ -19,39 +19,38 @@ public interface MusicGameSettleRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 ugc_guid = 9; - * @return The ugcGuid. + * bool is_unlock_next_level = 5; + * @return The isUnlockNextLevel. */ - long getUgcGuid(); + boolean getIsUnlockNextLevel(); /** - * int32 retcode = 12; + * int32 retcode = 7; * @return The retcode. */ int getRetcode(); /** - * uint32 music_basic_id = 7; + * uint32 music_basic_id = 10; * @return The musicBasicId. */ int getMusicBasicId(); /** - * bool is_unlock_next_level = 3; - * @return The isUnlockNextLevel. + * uint64 ugc_guid = 11; + * @return The ugcGuid. */ - boolean getIsUnlockNextLevel(); + long getUgcGuid(); /** - * bool is_new_record = 6; + * bool is_new_record = 15; * @return The isNewRecord. */ boolean getIsNewRecord(); } /** * 
-   * CmdId: 7327
-   * Obf: OEBOBHPHPGI
+   * CmdId: 25598
    *
* * Protobuf type {@code MusicGameSettleRsp} @@ -98,29 +97,29 @@ private MusicGameSettleRsp( case 0: done = true; break; - case 24: { + case 40: { isUnlockNextLevel_ = input.readBool(); break; } - case 48: { + case 56: { - isNewRecord_ = input.readBool(); + retcode_ = input.readInt32(); break; } - case 56: { + case 80: { musicBasicId_ = input.readUInt32(); break; } - case 72: { + case 88: { ugcGuid_ = input.readUInt64(); break; } - case 96: { + case 120: { - retcode_ = input.readInt32(); + isNewRecord_ = input.readBool(); break; } default: { @@ -155,21 +154,21 @@ private MusicGameSettleRsp( emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp.class, emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp.Builder.class); } - public static final int UGC_GUID_FIELD_NUMBER = 9; - private long ugcGuid_; + public static final int IS_UNLOCK_NEXT_LEVEL_FIELD_NUMBER = 5; + private boolean isUnlockNextLevel_; /** - * uint64 ugc_guid = 9; - * @return The ugcGuid. + * bool is_unlock_next_level = 5; + * @return The isUnlockNextLevel. */ @java.lang.Override - public long getUgcGuid() { - return ugcGuid_; + public boolean getIsUnlockNextLevel() { + return isUnlockNextLevel_; } - public static final int RETCODE_FIELD_NUMBER = 12; + public static final int RETCODE_FIELD_NUMBER = 7; private int retcode_; /** - * int32 retcode = 12; + * int32 retcode = 7; * @return The retcode. */ @java.lang.Override @@ -177,10 +176,10 @@ public int getRetcode() { return retcode_; } - public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 7; + public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 10; private int musicBasicId_; /** - * uint32 music_basic_id = 7; + * uint32 music_basic_id = 10; * @return The musicBasicId. */ @java.lang.Override @@ -188,21 +187,21 @@ public int getMusicBasicId() { return musicBasicId_; } - public static final int IS_UNLOCK_NEXT_LEVEL_FIELD_NUMBER = 3; - private boolean isUnlockNextLevel_; + public static final int UGC_GUID_FIELD_NUMBER = 11; + private long ugcGuid_; /** - * bool is_unlock_next_level = 3; - * @return The isUnlockNextLevel. + * uint64 ugc_guid = 11; + * @return The ugcGuid. */ @java.lang.Override - public boolean getIsUnlockNextLevel() { - return isUnlockNextLevel_; + public long getUgcGuid() { + return ugcGuid_; } - public static final int IS_NEW_RECORD_FIELD_NUMBER = 6; + public static final int IS_NEW_RECORD_FIELD_NUMBER = 15; private boolean isNewRecord_; /** - * bool is_new_record = 6; + * bool is_new_record = 15; * @return The isNewRecord. */ @java.lang.Override @@ -225,19 +224,19 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (isUnlockNextLevel_ != false) { - output.writeBool(3, isUnlockNextLevel_); + output.writeBool(5, isUnlockNextLevel_); } - if (isNewRecord_ != false) { - output.writeBool(6, isNewRecord_); + if (retcode_ != 0) { + output.writeInt32(7, retcode_); } if (musicBasicId_ != 0) { - output.writeUInt32(7, musicBasicId_); + output.writeUInt32(10, musicBasicId_); } if (ugcGuid_ != 0L) { - output.writeUInt64(9, ugcGuid_); + output.writeUInt64(11, ugcGuid_); } - if (retcode_ != 0) { - output.writeInt32(12, retcode_); + if (isNewRecord_ != false) { + output.writeBool(15, isNewRecord_); } unknownFields.writeTo(output); } @@ -250,23 +249,23 @@ public int getSerializedSize() { size = 0; if (isUnlockNextLevel_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, isUnlockNextLevel_); + .computeBoolSize(5, isUnlockNextLevel_); } - if (isNewRecord_ != false) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, isNewRecord_); + .computeInt32Size(7, retcode_); } if (musicBasicId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, musicBasicId_); + .computeUInt32Size(10, musicBasicId_); } if (ugcGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(9, ugcGuid_); + .computeUInt64Size(11, ugcGuid_); } - if (retcode_ != 0) { + if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(12, retcode_); + .computeBoolSize(15, isNewRecord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -283,14 +282,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp other = (emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp) obj; - if (getUgcGuid() - != other.getUgcGuid()) return false; + if (getIsUnlockNextLevel() + != other.getIsUnlockNextLevel()) return false; if (getRetcode() != other.getRetcode()) return false; if (getMusicBasicId() != other.getMusicBasicId()) return false; - if (getIsUnlockNextLevel() - != other.getIsUnlockNextLevel()) return false; + if (getUgcGuid() + != other.getUgcGuid()) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -304,16 +303,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + UGC_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getUgcGuid()); + hash = (37 * hash) + IS_UNLOCK_NEXT_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsUnlockNextLevel()); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (37 * hash) + MUSIC_BASIC_ID_FIELD_NUMBER; hash = (53 * hash) + getMusicBasicId(); - hash = (37 * hash) + IS_UNLOCK_NEXT_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsUnlockNextLevel()); + hash = (37 * hash) + UGC_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getUgcGuid()); hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); @@ -414,8 +413,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7327
-     * Obf: OEBOBHPHPGI
+     * CmdId: 25598
      *
* * Protobuf type {@code MusicGameSettleRsp} @@ -455,13 +453,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - ugcGuid_ = 0L; + isUnlockNextLevel_ = false; retcode_ = 0; musicBasicId_ = 0; - isUnlockNextLevel_ = false; + ugcGuid_ = 0L; isNewRecord_ = false; @@ -491,10 +489,10 @@ public emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp @java.lang.Override public emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp buildPartial() { emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp result = new emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp(this); - result.ugcGuid_ = ugcGuid_; + result.isUnlockNextLevel_ = isUnlockNextLevel_; result.retcode_ = retcode_; result.musicBasicId_ = musicBasicId_; - result.isUnlockNextLevel_ = isUnlockNextLevel_; + result.ugcGuid_ = ugcGuid_; result.isNewRecord_ = isNewRecord_; onBuilt(); return result; @@ -544,8 +542,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp other) { if (other == emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp.getDefaultInstance()) return this; - if (other.getUgcGuid() != 0L) { - setUgcGuid(other.getUgcGuid()); + if (other.getIsUnlockNextLevel() != false) { + setIsUnlockNextLevel(other.getIsUnlockNextLevel()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); @@ -553,8 +551,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.MusicGameSettleRspOuterClass. if (other.getMusicBasicId() != 0) { setMusicBasicId(other.getMusicBasicId()); } - if (other.getIsUnlockNextLevel() != false) { - setIsUnlockNextLevel(other.getIsUnlockNextLevel()); + if (other.getUgcGuid() != 0L) { + setUgcGuid(other.getUgcGuid()); } if (other.getIsNewRecord() != false) { setIsNewRecord(other.getIsNewRecord()); @@ -588,40 +586,40 @@ public Builder mergeFrom( return this; } - private long ugcGuid_ ; + private boolean isUnlockNextLevel_ ; /** - * uint64 ugc_guid = 9; - * @return The ugcGuid. + * bool is_unlock_next_level = 5; + * @return The isUnlockNextLevel. */ @java.lang.Override - public long getUgcGuid() { - return ugcGuid_; + public boolean getIsUnlockNextLevel() { + return isUnlockNextLevel_; } /** - * uint64 ugc_guid = 9; - * @param value The ugcGuid to set. + * bool is_unlock_next_level = 5; + * @param value The isUnlockNextLevel to set. * @return This builder for chaining. */ - public Builder setUgcGuid(long value) { + public Builder setIsUnlockNextLevel(boolean value) { - ugcGuid_ = value; + isUnlockNextLevel_ = value; onChanged(); return this; } /** - * uint64 ugc_guid = 9; + * bool is_unlock_next_level = 5; * @return This builder for chaining. */ - public Builder clearUgcGuid() { + public Builder clearIsUnlockNextLevel() { - ugcGuid_ = 0L; + isUnlockNextLevel_ = false; onChanged(); return this; } private int retcode_ ; /** - * int32 retcode = 12; + * int32 retcode = 7; * @return The retcode. */ @java.lang.Override @@ -629,7 +627,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 12; + * int32 retcode = 7; * @param value The retcode to set. * @return This builder for chaining. */ @@ -640,7 +638,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 12; + * int32 retcode = 7; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -652,7 +650,7 @@ public Builder clearRetcode() { private int musicBasicId_ ; /** - * uint32 music_basic_id = 7; + * uint32 music_basic_id = 10; * @return The musicBasicId. */ @java.lang.Override @@ -660,7 +658,7 @@ public int getMusicBasicId() { return musicBasicId_; } /** - * uint32 music_basic_id = 7; + * uint32 music_basic_id = 10; * @param value The musicBasicId to set. * @return This builder for chaining. */ @@ -671,7 +669,7 @@ public Builder setMusicBasicId(int value) { return this; } /** - * uint32 music_basic_id = 7; + * uint32 music_basic_id = 10; * @return This builder for chaining. */ public Builder clearMusicBasicId() { @@ -681,40 +679,40 @@ public Builder clearMusicBasicId() { return this; } - private boolean isUnlockNextLevel_ ; + private long ugcGuid_ ; /** - * bool is_unlock_next_level = 3; - * @return The isUnlockNextLevel. + * uint64 ugc_guid = 11; + * @return The ugcGuid. */ @java.lang.Override - public boolean getIsUnlockNextLevel() { - return isUnlockNextLevel_; + public long getUgcGuid() { + return ugcGuid_; } /** - * bool is_unlock_next_level = 3; - * @param value The isUnlockNextLevel to set. + * uint64 ugc_guid = 11; + * @param value The ugcGuid to set. * @return This builder for chaining. */ - public Builder setIsUnlockNextLevel(boolean value) { + public Builder setUgcGuid(long value) { - isUnlockNextLevel_ = value; + ugcGuid_ = value; onChanged(); return this; } /** - * bool is_unlock_next_level = 3; + * uint64 ugc_guid = 11; * @return This builder for chaining. */ - public Builder clearIsUnlockNextLevel() { + public Builder clearUgcGuid() { - isUnlockNextLevel_ = false; + ugcGuid_ = 0L; onChanged(); return this; } private boolean isNewRecord_ ; /** - * bool is_new_record = 6; + * bool is_new_record = 15; * @return The isNewRecord. */ @java.lang.Override @@ -722,7 +720,7 @@ public boolean getIsNewRecord() { return isNewRecord_; } /** - * bool is_new_record = 6; + * bool is_new_record = 15; * @param value The isNewRecord to set. * @return This builder for chaining. */ @@ -733,7 +731,7 @@ public Builder setIsNewRecord(boolean value) { return this; } /** - * bool is_new_record = 6; + * bool is_new_record = 15; * @return This builder for chaining. */ public Builder clearIsNewRecord() { @@ -810,9 +808,9 @@ public emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp static { java.lang.String[] descriptorData = { "\n\030MusicGameSettleRsp.proto\"\204\001\n\022MusicGame" + - "SettleRsp\022\020\n\010ugc_guid\030\t \001(\004\022\017\n\007retcode\030\014" + - " \001(\005\022\026\n\016music_basic_id\030\007 \001(\r\022\034\n\024is_unloc" + - "k_next_level\030\003 \001(\010\022\025\n\ris_new_record\030\006 \001(" + + "SettleRsp\022\034\n\024is_unlock_next_level\030\005 \001(\010\022" + + "\017\n\007retcode\030\007 \001(\005\022\026\n\016music_basic_id\030\n \001(\r" + + "\022\020\n\010ugc_guid\030\013 \001(\004\022\025\n\ris_new_record\030\017 \001(" + "\010B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -824,7 +822,7 @@ public emu.grasscutter.net.proto.MusicGameSettleRspOuterClass.MusicGameSettleRsp internal_static_MusicGameSettleRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MusicGameSettleRsp_descriptor, - new java.lang.String[] { "UgcGuid", "Retcode", "MusicBasicId", "IsUnlockNextLevel", "IsNewRecord", }); + new java.lang.String[] { "IsUnlockNextLevel", "Retcode", "MusicBasicId", "UgcGuid", "IsNewRecord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameStartReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameStartReqOuterClass.java index 7cd9730bd6e..42ea15e41e6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameStartReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameStartReqOuterClass.java @@ -19,27 +19,26 @@ public interface MusicGameStartReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint64 ugc_guid = 12; - * @return The ugcGuid. - */ - long getUgcGuid(); - - /** - * uint32 music_basic_id = 8; + * uint32 music_basic_id = 15; * @return The musicBasicId. */ int getMusicBasicId(); /** - * bool is_save_score = 13; + * bool is_save_score = 12; * @return The isSaveScore. */ boolean getIsSaveScore(); + + /** + * uint64 ugc_guid = 9; + * @return The ugcGuid. + */ + long getUgcGuid(); } /** * 
-   * CmdId: 2690
-   * Obf: GALCIMKINBH
+   * CmdId: 3045
    *
* * Protobuf type {@code MusicGameStartReq} @@ -86,19 +85,19 @@ private MusicGameStartReq( case 0: done = true; break; - case 64: { + case 72: { - musicBasicId_ = input.readUInt32(); + ugcGuid_ = input.readUInt64(); break; } case 96: { - ugcGuid_ = input.readUInt64(); + isSaveScore_ = input.readBool(); break; } - case 104: { + case 120: { - isSaveScore_ = input.readBool(); + musicBasicId_ = input.readUInt32(); break; } default: { @@ -133,21 +132,10 @@ private MusicGameStartReq( emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq.class, emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq.Builder.class); } - public static final int UGC_GUID_FIELD_NUMBER = 12; - private long ugcGuid_; - /** - * uint64 ugc_guid = 12; - * @return The ugcGuid. - */ - @java.lang.Override - public long getUgcGuid() { - return ugcGuid_; - } - - public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 8; + public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 15; private int musicBasicId_; /** - * uint32 music_basic_id = 8; + * uint32 music_basic_id = 15; * @return The musicBasicId. */ @java.lang.Override @@ -155,10 +143,10 @@ public int getMusicBasicId() { return musicBasicId_; } - public static final int IS_SAVE_SCORE_FIELD_NUMBER = 13; + public static final int IS_SAVE_SCORE_FIELD_NUMBER = 12; private boolean isSaveScore_; /** - * bool is_save_score = 13; + * bool is_save_score = 12; * @return The isSaveScore. */ @java.lang.Override @@ -166,6 +154,17 @@ public boolean getIsSaveScore() { return isSaveScore_; } + public static final int UGC_GUID_FIELD_NUMBER = 9; + private long ugcGuid_; + /** + * uint64 ugc_guid = 9; + * @return The ugcGuid. + */ + @java.lang.Override + public long getUgcGuid() { + return ugcGuid_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -180,14 +179,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (musicBasicId_ != 0) { - output.writeUInt32(8, musicBasicId_); - } if (ugcGuid_ != 0L) { - output.writeUInt64(12, ugcGuid_); + output.writeUInt64(9, ugcGuid_); } if (isSaveScore_ != false) { - output.writeBool(13, isSaveScore_); + output.writeBool(12, isSaveScore_); + } + if (musicBasicId_ != 0) { + output.writeUInt32(15, musicBasicId_); } unknownFields.writeTo(output); } @@ -198,17 +197,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (musicBasicId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, musicBasicId_); - } if (ugcGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(12, ugcGuid_); + .computeUInt64Size(9, ugcGuid_); } if (isSaveScore_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(13, isSaveScore_); + .computeBoolSize(12, isSaveScore_); + } + if (musicBasicId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(15, musicBasicId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +224,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq other = (emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq) obj; - if (getUgcGuid() - != other.getUgcGuid()) return false; if (getMusicBasicId() != other.getMusicBasicId()) return false; if (getIsSaveScore() != other.getIsSaveScore()) return false; + if (getUgcGuid() + != other.getUgcGuid()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,14 +241,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + UGC_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getUgcGuid()); hash = (37 * hash) + MUSIC_BASIC_ID_FIELD_NUMBER; hash = (53 * hash) + getMusicBasicId(); hash = (37 * hash) + IS_SAVE_SCORE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSaveScore()); + hash = (37 * hash) + UGC_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getUgcGuid()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -347,8 +346,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2690
-     * Obf: GALCIMKINBH
+     * CmdId: 3045
      *
* * Protobuf type {@code MusicGameStartReq} @@ -388,12 +386,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - ugcGuid_ = 0L; - musicBasicId_ = 0; isSaveScore_ = false; + ugcGuid_ = 0L; + return this; } @@ -420,9 +418,9 @@ public emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq b @java.lang.Override public emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq buildPartial() { emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq result = new emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq(this); - result.ugcGuid_ = ugcGuid_; result.musicBasicId_ = musicBasicId_; result.isSaveScore_ = isSaveScore_; + result.ugcGuid_ = ugcGuid_; onBuilt(); return result; } @@ -471,15 +469,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq other) { if (other == emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq.getDefaultInstance()) return this; - if (other.getUgcGuid() != 0L) { - setUgcGuid(other.getUgcGuid()); - } if (other.getMusicBasicId() != 0) { setMusicBasicId(other.getMusicBasicId()); } if (other.getIsSaveScore() != false) { setIsSaveScore(other.getIsSaveScore()); } + if (other.getUgcGuid() != 0L) { + setUgcGuid(other.getUgcGuid()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -509,95 +507,95 @@ public Builder mergeFrom( return this; } - private long ugcGuid_ ; + private int musicBasicId_ ; /** - * uint64 ugc_guid = 12; - * @return The ugcGuid. + * uint32 music_basic_id = 15; + * @return The musicBasicId. */ @java.lang.Override - public long getUgcGuid() { - return ugcGuid_; + public int getMusicBasicId() { + return musicBasicId_; } /** - * uint64 ugc_guid = 12; - * @param value The ugcGuid to set. + * uint32 music_basic_id = 15; + * @param value The musicBasicId to set. * @return This builder for chaining. */ - public Builder setUgcGuid(long value) { + public Builder setMusicBasicId(int value) { - ugcGuid_ = value; + musicBasicId_ = value; onChanged(); return this; } /** - * uint64 ugc_guid = 12; + * uint32 music_basic_id = 15; * @return This builder for chaining. */ - public Builder clearUgcGuid() { + public Builder clearMusicBasicId() { - ugcGuid_ = 0L; + musicBasicId_ = 0; onChanged(); return this; } - private int musicBasicId_ ; + private boolean isSaveScore_ ; /** - * uint32 music_basic_id = 8; - * @return The musicBasicId. + * bool is_save_score = 12; + * @return The isSaveScore. */ @java.lang.Override - public int getMusicBasicId() { - return musicBasicId_; + public boolean getIsSaveScore() { + return isSaveScore_; } /** - * uint32 music_basic_id = 8; - * @param value The musicBasicId to set. + * bool is_save_score = 12; + * @param value The isSaveScore to set. * @return This builder for chaining. */ - public Builder setMusicBasicId(int value) { + public Builder setIsSaveScore(boolean value) { - musicBasicId_ = value; + isSaveScore_ = value; onChanged(); return this; } /** - * uint32 music_basic_id = 8; + * bool is_save_score = 12; * @return This builder for chaining. */ - public Builder clearMusicBasicId() { + public Builder clearIsSaveScore() { - musicBasicId_ = 0; + isSaveScore_ = false; onChanged(); return this; } - private boolean isSaveScore_ ; + private long ugcGuid_ ; /** - * bool is_save_score = 13; - * @return The isSaveScore. + * uint64 ugc_guid = 9; + * @return The ugcGuid. */ @java.lang.Override - public boolean getIsSaveScore() { - return isSaveScore_; + public long getUgcGuid() { + return ugcGuid_; } /** - * bool is_save_score = 13; - * @param value The isSaveScore to set. + * uint64 ugc_guid = 9; + * @param value The ugcGuid to set. * @return This builder for chaining. */ - public Builder setIsSaveScore(boolean value) { + public Builder setUgcGuid(long value) { - isSaveScore_ = value; + ugcGuid_ = value; onChanged(); return this; } /** - * bool is_save_score = 13; + * uint64 ugc_guid = 9; * @return This builder for chaining. */ - public Builder clearIsSaveScore() { + public Builder clearUgcGuid() { - isSaveScore_ = false; + ugcGuid_ = 0L; onChanged(); return this; } @@ -669,8 +667,8 @@ public emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq g static { java.lang.String[] descriptorData = { "\n\027MusicGameStartReq.proto\"T\n\021MusicGameSt" + - "artReq\022\020\n\010ugc_guid\030\014 \001(\004\022\026\n\016music_basic_" + - "id\030\010 \001(\r\022\025\n\ris_save_score\030\r \001(\010B\033\n\031emu.g" + + "artReq\022\026\n\016music_basic_id\030\017 \001(\r\022\025\n\ris_sav" + + "e_score\030\014 \001(\010\022\020\n\010ugc_guid\030\t \001(\004B\033\n\031emu.g" + "rasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -682,7 +680,7 @@ public emu.grasscutter.net.proto.MusicGameStartReqOuterClass.MusicGameStartReq g internal_static_MusicGameStartReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_MusicGameStartReq_descriptor, - new java.lang.String[] { "UgcGuid", "MusicBasicId", "IsSaveScore", }); + new java.lang.String[] { "MusicBasicId", "IsSaveScore", "UgcGuid", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameStartRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameStartRspOuterClass.java index 6723ca19683..7f85416c75a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameStartRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameStartRspOuterClass.java @@ -19,27 +19,26 @@ public interface MusicGameStartRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 music_basic_id = 5; + * uint32 music_basic_id = 4; * @return The musicBasicId. */ int getMusicBasicId(); /** - * int32 retcode = 2; + * int32 retcode = 7; * @return The retcode. */ int getRetcode(); /** - * uint64 ugc_guid = 1; + * uint64 ugc_guid = 10; * @return The ugcGuid. */ long getUgcGuid(); } /** * 
-   * CmdId: 6458
-   * Obf: PFOCEKDDPBC
+   * CmdId: 27757
    *
* * Protobuf type {@code MusicGameStartRsp} @@ -86,19 +85,19 @@ private MusicGameStartRsp( case 0: done = true; break; - case 8: { + case 32: { - ugcGuid_ = input.readUInt64(); + musicBasicId_ = input.readUInt32(); break; } - case 16: { + case 56: { retcode_ = input.readInt32(); break; } - case 40: { + case 80: { - musicBasicId_ = input.readUInt32(); + ugcGuid_ = input.readUInt64(); break; } default: { @@ -133,10 +132,10 @@ private MusicGameStartRsp( emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.class, emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp.Builder.class); } - public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 5; + public static final int MUSIC_BASIC_ID_FIELD_NUMBER = 4; private int musicBasicId_; /** - * uint32 music_basic_id = 5; + * uint32 music_basic_id = 4; * @return The musicBasicId. */ @java.lang.Override @@ -144,10 +143,10 @@ public int getMusicBasicId() { return musicBasicId_; } - public static final int RETCODE_FIELD_NUMBER = 2; + public static final int RETCODE_FIELD_NUMBER = 7; private int retcode_; /** - * int32 retcode = 2; + * int32 retcode = 7; * @return The retcode. */ @java.lang.Override @@ -155,10 +154,10 @@ public int getRetcode() { return retcode_; } - public static final int UGC_GUID_FIELD_NUMBER = 1; + public static final int UGC_GUID_FIELD_NUMBER = 10; private long ugcGuid_; /** - * uint64 ugc_guid = 1; + * uint64 ugc_guid = 10; * @return The ugcGuid. */ @java.lang.Override @@ -180,14 +179,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (ugcGuid_ != 0L) { - output.writeUInt64(1, ugcGuid_); + if (musicBasicId_ != 0) { + output.writeUInt32(4, musicBasicId_); } if (retcode_ != 0) { - output.writeInt32(2, retcode_); + output.writeInt32(7, retcode_); } - if (musicBasicId_ != 0) { - output.writeUInt32(5, musicBasicId_); + if (ugcGuid_ != 0L) { + output.writeUInt64(10, ugcGuid_); } unknownFields.writeTo(output); } @@ -198,17 +197,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (ugcGuid_ != 0L) { + if (musicBasicId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(1, ugcGuid_); + .computeUInt32Size(4, musicBasicId_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, retcode_); + .computeInt32Size(7, retcode_); } - if (musicBasicId_ != 0) { + if (ugcGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, musicBasicId_); + .computeUInt64Size(10, ugcGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -346,8 +345,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 6458
-     * Obf: PFOCEKDDPBC
+     * CmdId: 27757
      *
* * Protobuf type {@code MusicGameStartRsp} @@ -510,7 +508,7 @@ public Builder mergeFrom( private int musicBasicId_ ; /** - * uint32 music_basic_id = 5; + * uint32 music_basic_id = 4; * @return The musicBasicId. */ @java.lang.Override @@ -518,7 +516,7 @@ public int getMusicBasicId() { return musicBasicId_; } /** - * uint32 music_basic_id = 5; + * uint32 music_basic_id = 4; * @param value The musicBasicId to set. * @return This builder for chaining. */ @@ -529,7 +527,7 @@ public Builder setMusicBasicId(int value) { return this; } /** - * uint32 music_basic_id = 5; + * uint32 music_basic_id = 4; * @return This builder for chaining. */ public Builder clearMusicBasicId() { @@ -541,7 +539,7 @@ public Builder clearMusicBasicId() { private int retcode_ ; /** - * int32 retcode = 2; + * int32 retcode = 7; * @return The retcode. */ @java.lang.Override @@ -549,7 +547,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 2; + * int32 retcode = 7; * @param value The retcode to set. * @return This builder for chaining. */ @@ -560,7 +558,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 2; + * int32 retcode = 7; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -572,7 +570,7 @@ public Builder clearRetcode() { private long ugcGuid_ ; /** - * uint64 ugc_guid = 1; + * uint64 ugc_guid = 10; * @return The ugcGuid. */ @java.lang.Override @@ -580,7 +578,7 @@ public long getUgcGuid() { return ugcGuid_; } /** - * uint64 ugc_guid = 1; + * uint64 ugc_guid = 10; * @param value The ugcGuid to set. * @return This builder for chaining. */ @@ -591,7 +589,7 @@ public Builder setUgcGuid(long value) { return this; } /** - * uint64 ugc_guid = 1; + * uint64 ugc_guid = 10; * @return This builder for chaining. */ public Builder clearUgcGuid() { @@ -668,8 +666,8 @@ public emu.grasscutter.net.proto.MusicGameStartRspOuterClass.MusicGameStartRsp g static { java.lang.String[] descriptorData = { "\n\027MusicGameStartRsp.proto\"N\n\021MusicGameSt" + - "artRsp\022\026\n\016music_basic_id\030\005 \001(\r\022\017\n\007retcod" + - "e\030\002 \001(\005\022\020\n\010ugc_guid\030\001 \001(\004B\033\n\031emu.grasscu" + + "artRsp\022\026\n\016music_basic_id\030\004 \001(\r\022\017\n\007retcod" + + "e\030\007 \001(\005\022\020\n\010ugc_guid\030\n \001(\004B\033\n\031emu.grasscu" + "tter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PacmanSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PacmanSettleInfoOuterClass.java index 52f74f4c026..8ea07f653a6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PacmanSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PacmanSettleInfoOuterClass.java @@ -19,45 +19,41 @@ public interface PacmanSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 final_score = 8; - * @return The finalScore. - */ - int getFinalScore(); - - /** - * uint32 GIMCFEIADKI = 6; - * @return The gIMCFEIADKI. + * bool is_new_record = 2; + * @return The isNewRecord. */ - int getGIMCFEIADKI(); + boolean getIsNewRecord(); /** - * bool is_new_record = 3; - * @return The isNewRecord. + * uint32 final_score = 3; + * @return The finalScore. */ - boolean getIsNewRecord(); + int getFinalScore(); /** - * uint32 NHFGIBDCPGC = 4; - * @return The nHFGIBDCPGC. + * uint32 CLOCEGAAHJN = 5; + * @return The cLOCEGAAHJN. */ - int getNHFGIBDCPGC(); + int getCLOCEGAAHJN(); /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @return The enum numeric value on the wire for reason. */ int getReasonValue(); /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @return The reason. */ emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH getReason(); + + /** + * uint32 LEKFEJHKPPE = 13; + * @return The lEKFEJHKPPE. + */ + int getLEKFEJHKPPE(); } /** - * 
-   * Obf: EIBDAICPDMP
-   *
- * * Protobuf type {@code PacmanSettleInfo} */ public static final class PacmanSettleInfo extends @@ -103,30 +99,30 @@ private PacmanSettleInfo( case 0: done = true; break; - case 24: { + case 16: { isNewRecord_ = input.readBool(); break; } - case 32: { + case 24: { - nHFGIBDCPGC_ = input.readUInt32(); + finalScore_ = input.readUInt32(); break; } case 40: { - int rawValue = input.readEnum(); - reason_ = rawValue; + cLOCEGAAHJN_ = input.readUInt32(); break; } case 48: { + int rawValue = input.readEnum(); - gIMCFEIADKI_ = input.readUInt32(); + reason_ = rawValue; break; } - case 64: { + case 104: { - finalScore_ = input.readUInt32(); + lEKFEJHKPPE_ = input.readUInt32(); break; } default: { @@ -161,61 +157,50 @@ private PacmanSettleInfo( emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.class, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder.class); } - public static final int FINAL_SCORE_FIELD_NUMBER = 8; - private int finalScore_; - /** - * uint32 final_score = 8; - * @return The finalScore. - */ - @java.lang.Override - public int getFinalScore() { - return finalScore_; - } - - public static final int GIMCFEIADKI_FIELD_NUMBER = 6; - private int gIMCFEIADKI_; + public static final int IS_NEW_RECORD_FIELD_NUMBER = 2; + private boolean isNewRecord_; /** - * uint32 GIMCFEIADKI = 6; - * @return The gIMCFEIADKI. + * bool is_new_record = 2; + * @return The isNewRecord. */ @java.lang.Override - public int getGIMCFEIADKI() { - return gIMCFEIADKI_; + public boolean getIsNewRecord() { + return isNewRecord_; } - public static final int IS_NEW_RECORD_FIELD_NUMBER = 3; - private boolean isNewRecord_; + public static final int FINAL_SCORE_FIELD_NUMBER = 3; + private int finalScore_; /** - * bool is_new_record = 3; - * @return The isNewRecord. + * uint32 final_score = 3; + * @return The finalScore. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getFinalScore() { + return finalScore_; } - public static final int NHFGIBDCPGC_FIELD_NUMBER = 4; - private int nHFGIBDCPGC_; + public static final int CLOCEGAAHJN_FIELD_NUMBER = 5; + private int cLOCEGAAHJN_; /** - * uint32 NHFGIBDCPGC = 4; - * @return The nHFGIBDCPGC. + * uint32 CLOCEGAAHJN = 5; + * @return The cLOCEGAAHJN. */ @java.lang.Override - public int getNHFGIBDCPGC() { - return nHFGIBDCPGC_; + public int getCLOCEGAAHJN() { + return cLOCEGAAHJN_; } - public static final int REASON_FIELD_NUMBER = 5; + public static final int REASON_FIELD_NUMBER = 6; private int reason_; /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @return The enum numeric value on the wire for reason. */ @java.lang.Override public int getReasonValue() { return reason_; } /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @return The reason. */ @java.lang.Override public emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH getReason() { @@ -224,6 +209,17 @@ public int getNHFGIBDCPGC() { return result == null ? emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH.UNRECOGNIZED : result; } + public static final int LEKFEJHKPPE_FIELD_NUMBER = 13; + private int lEKFEJHKPPE_; + /** + * uint32 LEKFEJHKPPE = 13; + * @return The lEKFEJHKPPE. + */ + @java.lang.Override + public int getLEKFEJHKPPE() { + return lEKFEJHKPPE_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -239,19 +235,19 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (isNewRecord_ != false) { - output.writeBool(3, isNewRecord_); + output.writeBool(2, isNewRecord_); } - if (nHFGIBDCPGC_ != 0) { - output.writeUInt32(4, nHFGIBDCPGC_); + if (finalScore_ != 0) { + output.writeUInt32(3, finalScore_); } - if (reason_ != emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH.FKMJAPDCONH_PacmanDungeonStopNone.getNumber()) { - output.writeEnum(5, reason_); + if (cLOCEGAAHJN_ != 0) { + output.writeUInt32(5, cLOCEGAAHJN_); } - if (gIMCFEIADKI_ != 0) { - output.writeUInt32(6, gIMCFEIADKI_); + if (reason_ != emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH.FKMJAPDCONH_PacmanDungeonStopNone.getNumber()) { + output.writeEnum(6, reason_); } - if (finalScore_ != 0) { - output.writeUInt32(8, finalScore_); + if (lEKFEJHKPPE_ != 0) { + output.writeUInt32(13, lEKFEJHKPPE_); } unknownFields.writeTo(output); } @@ -264,23 +260,23 @@ public int getSerializedSize() { size = 0; if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, isNewRecord_); + .computeBoolSize(2, isNewRecord_); } - if (nHFGIBDCPGC_ != 0) { + if (finalScore_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, nHFGIBDCPGC_); + .computeUInt32Size(3, finalScore_); } - if (reason_ != emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH.FKMJAPDCONH_PacmanDungeonStopNone.getNumber()) { + if (cLOCEGAAHJN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(5, reason_); + .computeUInt32Size(5, cLOCEGAAHJN_); } - if (gIMCFEIADKI_ != 0) { + if (reason_ != emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH.FKMJAPDCONH_PacmanDungeonStopNone.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, gIMCFEIADKI_); + .computeEnumSize(6, reason_); } - if (finalScore_ != 0) { + if (lEKFEJHKPPE_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, finalScore_); + .computeUInt32Size(13, lEKFEJHKPPE_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -297,15 +293,15 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo other = (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) obj; - if (getFinalScore() - != other.getFinalScore()) return false; - if (getGIMCFEIADKI() - != other.getGIMCFEIADKI()) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; - if (getNHFGIBDCPGC() - != other.getNHFGIBDCPGC()) return false; + if (getFinalScore() + != other.getFinalScore()) return false; + if (getCLOCEGAAHJN() + != other.getCLOCEGAAHJN()) return false; if (reason_ != other.reason_) return false; + if (getLEKFEJHKPPE() + != other.getLEKFEJHKPPE()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -317,17 +313,17 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + FINAL_SCORE_FIELD_NUMBER; - hash = (53 * hash) + getFinalScore(); - hash = (37 * hash) + GIMCFEIADKI_FIELD_NUMBER; - hash = (53 * hash) + getGIMCFEIADKI(); hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); - hash = (37 * hash) + NHFGIBDCPGC_FIELD_NUMBER; - hash = (53 * hash) + getNHFGIBDCPGC(); + hash = (37 * hash) + FINAL_SCORE_FIELD_NUMBER; + hash = (53 * hash) + getFinalScore(); + hash = (37 * hash) + CLOCEGAAHJN_FIELD_NUMBER; + hash = (53 * hash) + getCLOCEGAAHJN(); hash = (37 * hash) + REASON_FIELD_NUMBER; hash = (53 * hash) + reason_; + hash = (37 * hash) + LEKFEJHKPPE_FIELD_NUMBER; + hash = (53 * hash) + getLEKFEJHKPPE(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -424,10 +420,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: EIBDAICPDMP
-     *
- * * Protobuf type {@code PacmanSettleInfo} */ public static final class Builder extends @@ -465,16 +457,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - finalScore_ = 0; - - gIMCFEIADKI_ = 0; - isNewRecord_ = false; - nHFGIBDCPGC_ = 0; + finalScore_ = 0; + + cLOCEGAAHJN_ = 0; reason_ = 0; + lEKFEJHKPPE_ = 0; + return this; } @@ -501,11 +493,11 @@ public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo bui @java.lang.Override public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo buildPartial() { emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo result = new emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo(this); - result.finalScore_ = finalScore_; - result.gIMCFEIADKI_ = gIMCFEIADKI_; result.isNewRecord_ = isNewRecord_; - result.nHFGIBDCPGC_ = nHFGIBDCPGC_; + result.finalScore_ = finalScore_; + result.cLOCEGAAHJN_ = cLOCEGAAHJN_; result.reason_ = reason_; + result.lEKFEJHKPPE_ = lEKFEJHKPPE_; onBuilt(); return result; } @@ -554,21 +546,21 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo other) { if (other == emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance()) return this; - if (other.getFinalScore() != 0) { - setFinalScore(other.getFinalScore()); - } - if (other.getGIMCFEIADKI() != 0) { - setGIMCFEIADKI(other.getGIMCFEIADKI()); - } if (other.getIsNewRecord() != false) { setIsNewRecord(other.getIsNewRecord()); } - if (other.getNHFGIBDCPGC() != 0) { - setNHFGIBDCPGC(other.getNHFGIBDCPGC()); + if (other.getFinalScore() != 0) { + setFinalScore(other.getFinalScore()); + } + if (other.getCLOCEGAAHJN() != 0) { + setCLOCEGAAHJN(other.getCLOCEGAAHJN()); } if (other.reason_ != 0) { setReasonValue(other.getReasonValue()); } + if (other.getLEKFEJHKPPE() != 0) { + setLEKFEJHKPPE(other.getLEKFEJHKPPE()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -598,140 +590,109 @@ public Builder mergeFrom( return this; } - private int finalScore_ ; - /** - * uint32 final_score = 8; - * @return The finalScore. - */ - @java.lang.Override - public int getFinalScore() { - return finalScore_; - } - /** - * uint32 final_score = 8; - * @param value The finalScore to set. - * @return This builder for chaining. - */ - public Builder setFinalScore(int value) { - - finalScore_ = value; - onChanged(); - return this; - } - /** - * uint32 final_score = 8; - * @return This builder for chaining. - */ - public Builder clearFinalScore() { - - finalScore_ = 0; - onChanged(); - return this; - } - - private int gIMCFEIADKI_ ; + private boolean isNewRecord_ ; /** - * uint32 GIMCFEIADKI = 6; - * @return The gIMCFEIADKI. + * bool is_new_record = 2; + * @return The isNewRecord. */ @java.lang.Override - public int getGIMCFEIADKI() { - return gIMCFEIADKI_; + public boolean getIsNewRecord() { + return isNewRecord_; } /** - * uint32 GIMCFEIADKI = 6; - * @param value The gIMCFEIADKI to set. + * bool is_new_record = 2; + * @param value The isNewRecord to set. * @return This builder for chaining. */ - public Builder setGIMCFEIADKI(int value) { + public Builder setIsNewRecord(boolean value) { - gIMCFEIADKI_ = value; + isNewRecord_ = value; onChanged(); return this; } /** - * uint32 GIMCFEIADKI = 6; + * bool is_new_record = 2; * @return This builder for chaining. */ - public Builder clearGIMCFEIADKI() { + public Builder clearIsNewRecord() { - gIMCFEIADKI_ = 0; + isNewRecord_ = false; onChanged(); return this; } - private boolean isNewRecord_ ; + private int finalScore_ ; /** - * bool is_new_record = 3; - * @return The isNewRecord. + * uint32 final_score = 3; + * @return The finalScore. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getFinalScore() { + return finalScore_; } /** - * bool is_new_record = 3; - * @param value The isNewRecord to set. + * uint32 final_score = 3; + * @param value The finalScore to set. * @return This builder for chaining. */ - public Builder setIsNewRecord(boolean value) { + public Builder setFinalScore(int value) { - isNewRecord_ = value; + finalScore_ = value; onChanged(); return this; } /** - * bool is_new_record = 3; + * uint32 final_score = 3; * @return This builder for chaining. */ - public Builder clearIsNewRecord() { + public Builder clearFinalScore() { - isNewRecord_ = false; + finalScore_ = 0; onChanged(); return this; } - private int nHFGIBDCPGC_ ; + private int cLOCEGAAHJN_ ; /** - * uint32 NHFGIBDCPGC = 4; - * @return The nHFGIBDCPGC. + * uint32 CLOCEGAAHJN = 5; + * @return The cLOCEGAAHJN. */ @java.lang.Override - public int getNHFGIBDCPGC() { - return nHFGIBDCPGC_; + public int getCLOCEGAAHJN() { + return cLOCEGAAHJN_; } /** - * uint32 NHFGIBDCPGC = 4; - * @param value The nHFGIBDCPGC to set. + * uint32 CLOCEGAAHJN = 5; + * @param value The cLOCEGAAHJN to set. * @return This builder for chaining. */ - public Builder setNHFGIBDCPGC(int value) { + public Builder setCLOCEGAAHJN(int value) { - nHFGIBDCPGC_ = value; + cLOCEGAAHJN_ = value; onChanged(); return this; } /** - * uint32 NHFGIBDCPGC = 4; + * uint32 CLOCEGAAHJN = 5; * @return This builder for chaining. */ - public Builder clearNHFGIBDCPGC() { + public Builder clearCLOCEGAAHJN() { - nHFGIBDCPGC_ = 0; + cLOCEGAAHJN_ = 0; onChanged(); return this; } private int reason_ = 0; /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @return The enum numeric value on the wire for reason. */ @java.lang.Override public int getReasonValue() { return reason_; } /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @param value The enum numeric value on the wire for reason to set. * @return This builder for chaining. */ @@ -742,7 +703,7 @@ public Builder setReasonValue(int value) { return this; } /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @return The reason. */ @java.lang.Override @@ -752,7 +713,7 @@ public emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH getReason() { return result == null ? emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPDCONH.UNRECOGNIZED : result; } /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @param value The reason to set. * @return This builder for chaining. */ @@ -766,7 +727,7 @@ public Builder setReason(emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.FKMJAPD return this; } /** - * .FKMJAPDCONH reason = 5; + * .FKMJAPDCONH reason = 6; * @return This builder for chaining. */ public Builder clearReason() { @@ -775,6 +736,37 @@ public Builder clearReason() { onChanged(); return this; } + + private int lEKFEJHKPPE_ ; + /** + * uint32 LEKFEJHKPPE = 13; + * @return The lEKFEJHKPPE. + */ + @java.lang.Override + public int getLEKFEJHKPPE() { + return lEKFEJHKPPE_; + } + /** + * uint32 LEKFEJHKPPE = 13; + * @param value The lEKFEJHKPPE to set. + * @return This builder for chaining. + */ + public Builder setLEKFEJHKPPE(int value) { + + lEKFEJHKPPE_ = value; + onChanged(); + return this; + } + /** + * uint32 LEKFEJHKPPE = 13; + * @return This builder for chaining. + */ + public Builder clearLEKFEJHKPPE() { + + lEKFEJHKPPE_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -843,10 +835,10 @@ public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo get static { java.lang.String[] descriptorData = { "\n\026PacmanSettleInfo.proto\032\021FKMJAPDCONH.pr" + - "oto\"\206\001\n\020PacmanSettleInfo\022\023\n\013final_score\030" + - "\010 \001(\r\022\023\n\013GIMCFEIADKI\030\006 \001(\r\022\025\n\ris_new_rec" + - "ord\030\003 \001(\010\022\023\n\013NHFGIBDCPGC\030\004 \001(\r\022\034\n\006reason" + - "\030\005 \001(\0162\014.FKMJAPDCONHB\033\n\031emu.grasscutter." + + "oto\"\206\001\n\020PacmanSettleInfo\022\025\n\ris_new_recor" + + "d\030\002 \001(\010\022\023\n\013final_score\030\003 \001(\r\022\023\n\013CLOCEGAA" + + "HJN\030\005 \001(\r\022\034\n\006reason\030\006 \001(\0162\014.FKMJAPDCONH\022" + + "\023\n\013LEKFEJHKPPE\030\r \001(\rB\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -859,7 +851,7 @@ public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo get internal_static_PacmanSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PacmanSettleInfo_descriptor, - new java.lang.String[] { "FinalScore", "GIMCFEIADKI", "IsNewRecord", "NHFGIBDCPGC", "Reason", }); + new java.lang.String[] { "IsNewRecord", "FinalScore", "CLOCEGAAHJN", "Reason", "LEKFEJHKPPE", }); emu.grasscutter.net.proto.FKMJAPDCONHOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ParamListOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ParamListOuterClass.java index 33bac4a21c9..6a1da0cfff8 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ParamListOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ParamListOuterClass.java @@ -36,10 +36,6 @@ public interface ParamListOrBuilder extends int getParamList(int index); } /** - * 
-   * 5.0.0
-   *
- * * Protobuf type {@code ParamList} */ public static final class ParamList extends @@ -343,10 +339,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * 5.0.0
-     *
- * * Protobuf type {@code ParamList} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataRspOuterClass.java index b71ee101984..b82b1037c67 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataRspOuterClass.java @@ -19,85 +19,138 @@ public interface PersonalLineAllDataRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+     * obf: INEIKFAFMEO 解出来的可能不对
+     *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @return A list containing the canBeUnlockedPersonalLineList. */ java.util.List getCanBeUnlockedPersonalLineListList(); /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+     * obf: INEIKFAFMEO 解出来的可能不对
+     *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @return The count of canBeUnlockedPersonalLineList. */ int getCanBeUnlockedPersonalLineListCount(); /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+     * obf: INEIKFAFMEO 解出来的可能不对
+     *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @param index The index of the element to return. * @return The canBeUnlockedPersonalLineList at the given index. */ int getCanBeUnlockedPersonalLineList(int index); /** - * int32 retcode = 3; - * @return The retcode. + * uint32 legendary_key_count = 2; + * @return The legendaryKeyCount. */ - int getRetcode(); + int getLegendaryKeyCount(); /** - * uint32 cur_finished_daily_task_count = 11; - * @return The curFinishedDailyTaskCount. + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ - int getCurFinishedDailyTaskCount(); - + java.util.List + getLockedPersonalLineListList(); /** - * uint32 legendary_key_count = 1; - * @return The legendaryKeyCount. + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ - int getLegendaryKeyCount(); + emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData getLockedPersonalLineList(int index); + /** + * repeated .LockedPersonallineData locked_personal_line_list = 7; + */ + int getLockedPersonalLineListCount(); + /** + * repeated .LockedPersonallineData locked_personal_line_list = 7; + */ + java.util.List + getLockedPersonalLineListOrBuilderList(); + /** + * repeated .LockedPersonallineData locked_personal_line_list = 7; + */ + emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineDataOrBuilder getLockedPersonalLineListOrBuilder( + int index); /** - * repeated uint32 ongoing_personal_line_list = 6; + * 
+     * obf: JHPDOHCMKEC 解出来的可能不对
+     *
+ * + * repeated uint32 ongoing_personal_line_list = 10; * @return A list containing the ongoingPersonalLineList. */ java.util.List getOngoingPersonalLineListList(); /** - * repeated uint32 ongoing_personal_line_list = 6; + * 
+     * obf: JHPDOHCMKEC 解出来的可能不对
+     *
+ * + * repeated uint32 ongoing_personal_line_list = 10; * @return The count of ongoingPersonalLineList. */ int getOngoingPersonalLineListCount(); /** - * repeated uint32 ongoing_personal_line_list = 6; + * 
+     * obf: JHPDOHCMKEC 解出来的可能不对
+     *
+ * + * repeated uint32 ongoing_personal_line_list = 10; * @param index The index of the element to return. * @return The ongoingPersonalLineList at the given index. */ int getOngoingPersonalLineList(int index); /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * int32 retcode = 11; + * @return The retcode. */ - java.util.List - getLockedPersonalLineListList(); + int getRetcode(); + /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * uint32 cur_finished_daily_task_count = 12; + * @return The curFinishedDailyTaskCount. */ - emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData getLockedPersonalLineList(int index); + int getCurFinishedDailyTaskCount(); + /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * 
+     * obf: BPBOJKLJAGA 解出来的可能不对
+     *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @return A list containing the bPBOJKLJAGA. */ - int getLockedPersonalLineListCount(); + java.util.List getBPBOJKLJAGAList(); /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * 
+     * obf: BPBOJKLJAGA 解出来的可能不对
+     *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @return The count of bPBOJKLJAGA. */ - java.util.List - getLockedPersonalLineListOrBuilderList(); + int getBPBOJKLJAGACount(); /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * 
+     * obf: BPBOJKLJAGA 解出来的可能不对
+     *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @param index The index of the element to return. + * @return The bPBOJKLJAGA at the given index. */ - emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineDataOrBuilder getLockedPersonalLineListOrBuilder( - int index); + int getBPBOJKLJAGA(int index); } /** * 
-   * CmdId: 20607
-   * Obf: EKHCNHLAPJL
+   * CmdId: 28577
+   * obf: AGDOIEMEJIN
    *
* * Protobuf type {@code PersonalLineAllDataRsp} @@ -113,8 +166,9 @@ private PersonalLineAllDataRsp(com.google.protobuf.GeneratedMessageV3.Builder } private PersonalLineAllDataRsp() { canBeUnlockedPersonalLineList_ = emptyIntList(); - ongoingPersonalLineList_ = emptyIntList(); lockedPersonalLineList_ = java.util.Collections.emptyList(); + ongoingPersonalLineList_ = emptyIntList(); + bPBOJKLJAGA_ = emptyIntList(); } @java.lang.Override @@ -149,11 +203,6 @@ private PersonalLineAllDataRsp( done = true; break; case 8: { - - legendaryKeyCount_ = input.readUInt32(); - break; - } - case 16: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { canBeUnlockedPersonalLineList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -161,7 +210,7 @@ private PersonalLineAllDataRsp( canBeUnlockedPersonalLineList_.addInt(input.readUInt32()); break; } - case 18: { + case 10: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -174,25 +223,34 @@ private PersonalLineAllDataRsp( input.popLimit(limit); break; } - case 24: { + case 16: { - retcode_ = input.readInt32(); + legendaryKeyCount_ = input.readUInt32(); break; } - case 48: { + case 58: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - ongoingPersonalLineList_ = newIntList(); + lockedPersonalLineList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } + lockedPersonalLineList_.add( + input.readMessage(emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.parser(), extensionRegistry)); + break; + } + case 80: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + ongoingPersonalLineList_ = newIntList(); + mutable_bitField0_ |= 0x00000004; + } ongoingPersonalLineList_.addInt(input.readUInt32()); break; } - case 50: { + case 82: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { ongoingPersonalLineList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000004; } while (input.getBytesUntilLimit() > 0) { ongoingPersonalLineList_.addInt(input.readUInt32()); @@ -200,20 +258,37 @@ private PersonalLineAllDataRsp( input.popLimit(limit); break; } - case 66: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { - lockedPersonalLineList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - lockedPersonalLineList_.add( - input.readMessage(emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.parser(), extensionRegistry)); + case 88: { + + retcode_ = input.readInt32(); break; } - case 88: { + case 96: { curFinishedDailyTaskCount_ = input.readUInt32(); break; } + case 104: { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { + bPBOJKLJAGA_ = newIntList(); + mutable_bitField0_ |= 0x00000008; + } + bPBOJKLJAGA_.addInt(input.readUInt32()); + break; + } + case 106: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) { + bPBOJKLJAGA_ = newIntList(); + mutable_bitField0_ |= 0x00000008; + } + while (input.getBytesUntilLimit() > 0) { + bPBOJKLJAGA_.addInt(input.readUInt32()); + } + input.popLimit(limit); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -233,10 +308,13 @@ private PersonalLineAllDataRsp( canBeUnlockedPersonalLineList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { - ongoingPersonalLineList_.makeImmutable(); // C + lockedPersonalLineList_ = java.util.Collections.unmodifiableList(lockedPersonalLineList_); } if (((mutable_bitField0_ & 0x00000004) != 0)) { - lockedPersonalLineList_ = java.util.Collections.unmodifiableList(lockedPersonalLineList_); + ongoingPersonalLineList_.makeImmutable(); // C + } + if (((mutable_bitField0_ & 0x00000008) != 0)) { + bPBOJKLJAGA_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -255,10 +333,14 @@ private PersonalLineAllDataRsp( emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.class, emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAllDataRsp.Builder.class); } - public static final int CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 2; + public static final int CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 1; private com.google.protobuf.Internal.IntList canBeUnlockedPersonalLineList_; /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+     * obf: INEIKFAFMEO 解出来的可能不对
+     *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @return A list containing the canBeUnlockedPersonalLineList. */ @java.lang.Override @@ -267,14 +349,22 @@ private PersonalLineAllDataRsp( return canBeUnlockedPersonalLineList_; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+     * obf: INEIKFAFMEO 解出来的可能不对
+     *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @return The count of canBeUnlockedPersonalLineList. */ public int getCanBeUnlockedPersonalLineListCount() { return canBeUnlockedPersonalLineList_.size(); } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+     * obf: INEIKFAFMEO 解出来的可能不对
+     *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @param index The index of the element to return. * @return The canBeUnlockedPersonalLineList at the given index. */ @@ -283,43 +373,65 @@ public int getCanBeUnlockedPersonalLineList(int index) { } private int canBeUnlockedPersonalLineListMemoizedSerializedSize = -1; - public static final int RETCODE_FIELD_NUMBER = 3; - private int retcode_; + public static final int LEGENDARY_KEY_COUNT_FIELD_NUMBER = 2; + private int legendaryKeyCount_; /** - * int32 retcode = 3; - * @return The retcode. + * uint32 legendary_key_count = 2; + * @return The legendaryKeyCount. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getLegendaryKeyCount() { + return legendaryKeyCount_; } - public static final int CUR_FINISHED_DAILY_TASK_COUNT_FIELD_NUMBER = 11; - private int curFinishedDailyTaskCount_; + public static final int LOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 7; + private java.util.List lockedPersonalLineList_; /** - * uint32 cur_finished_daily_task_count = 11; - * @return The curFinishedDailyTaskCount. + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ @java.lang.Override - public int getCurFinishedDailyTaskCount() { - return curFinishedDailyTaskCount_; + public java.util.List getLockedPersonalLineListList() { + return lockedPersonalLineList_; } - - public static final int LEGENDARY_KEY_COUNT_FIELD_NUMBER = 1; - private int legendaryKeyCount_; /** - * uint32 legendary_key_count = 1; - * @return The legendaryKeyCount. + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ @java.lang.Override - public int getLegendaryKeyCount() { - return legendaryKeyCount_; + public java.util.List + getLockedPersonalLineListOrBuilderList() { + return lockedPersonalLineList_; + } + /** + * repeated .LockedPersonallineData locked_personal_line_list = 7; + */ + @java.lang.Override + public int getLockedPersonalLineListCount() { + return lockedPersonalLineList_.size(); + } + /** + * repeated .LockedPersonallineData locked_personal_line_list = 7; + */ + @java.lang.Override + public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData getLockedPersonalLineList(int index) { + return lockedPersonalLineList_.get(index); + } + /** + * repeated .LockedPersonallineData locked_personal_line_list = 7; + */ + @java.lang.Override + public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineDataOrBuilder getLockedPersonalLineListOrBuilder( + int index) { + return lockedPersonalLineList_.get(index); } - public static final int ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER = 6; + public static final int ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER = 10; private com.google.protobuf.Internal.IntList ongoingPersonalLineList_; /** - * repeated uint32 ongoing_personal_line_list = 6; + * 
+     * obf: JHPDOHCMKEC 解出来的可能不对
+     *
+ * + * repeated uint32 ongoing_personal_line_list = 10; * @return A list containing the ongoingPersonalLineList. */ @java.lang.Override @@ -328,14 +440,22 @@ public int getLegendaryKeyCount() { return ongoingPersonalLineList_; } /** - * repeated uint32 ongoing_personal_line_list = 6; + * 
+     * obf: JHPDOHCMKEC 解出来的可能不对
+     *
+ * + * repeated uint32 ongoing_personal_line_list = 10; * @return The count of ongoingPersonalLineList. */ public int getOngoingPersonalLineListCount() { return ongoingPersonalLineList_.size(); } /** - * repeated uint32 ongoing_personal_line_list = 6; + * 
+     * obf: JHPDOHCMKEC 解出来的可能不对
+     *
+ * + * repeated uint32 ongoing_personal_line_list = 10; * @param index The index of the element to return. * @return The ongoingPersonalLineList at the given index. */ @@ -344,45 +464,67 @@ public int getOngoingPersonalLineList(int index) { } private int ongoingPersonalLineListMemoizedSerializedSize = -1; - public static final int LOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER = 8; - private java.util.List lockedPersonalLineList_; + public static final int RETCODE_FIELD_NUMBER = 11; + private int retcode_; /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public java.util.List getLockedPersonalLineListList() { - return lockedPersonalLineList_; + public int getRetcode() { + return retcode_; } + + public static final int CUR_FINISHED_DAILY_TASK_COUNT_FIELD_NUMBER = 12; + private int curFinishedDailyTaskCount_; /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * uint32 cur_finished_daily_task_count = 12; + * @return The curFinishedDailyTaskCount. */ @java.lang.Override - public java.util.List - getLockedPersonalLineListOrBuilderList() { - return lockedPersonalLineList_; + public int getCurFinishedDailyTaskCount() { + return curFinishedDailyTaskCount_; } + + public static final int BPBOJKLJAGA_FIELD_NUMBER = 13; + private com.google.protobuf.Internal.IntList bPBOJKLJAGA_; /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * 
+     * obf: BPBOJKLJAGA 解出来的可能不对
+     *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @return A list containing the bPBOJKLJAGA. */ @java.lang.Override - public int getLockedPersonalLineListCount() { - return lockedPersonalLineList_.size(); + public java.util.List + getBPBOJKLJAGAList() { + return bPBOJKLJAGA_; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * 
+     * obf: BPBOJKLJAGA 解出来的可能不对
+     *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @return The count of bPBOJKLJAGA. */ - @java.lang.Override - public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData getLockedPersonalLineList(int index) { - return lockedPersonalLineList_.get(index); + public int getBPBOJKLJAGACount() { + return bPBOJKLJAGA_.size(); } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * 
+     * obf: BPBOJKLJAGA 解出来的可能不对
+     *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @param index The index of the element to return. + * @return The bPBOJKLJAGA at the given index. */ - @java.lang.Override - public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineDataOrBuilder getLockedPersonalLineListOrBuilder( - int index) { - return lockedPersonalLineList_.get(index); + public int getBPBOJKLJAGA(int index) { + return bPBOJKLJAGA_.getInt(index); } + private int bPBOJKLJAGAMemoizedSerializedSize = -1; private byte memoizedIsInitialized = -1; @java.lang.Override @@ -399,31 +541,38 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (legendaryKeyCount_ != 0) { - output.writeUInt32(1, legendaryKeyCount_); - } if (getCanBeUnlockedPersonalLineListList().size() > 0) { - output.writeUInt32NoTag(18); + output.writeUInt32NoTag(10); output.writeUInt32NoTag(canBeUnlockedPersonalLineListMemoizedSerializedSize); } for (int i = 0; i < canBeUnlockedPersonalLineList_.size(); i++) { output.writeUInt32NoTag(canBeUnlockedPersonalLineList_.getInt(i)); } - if (retcode_ != 0) { - output.writeInt32(3, retcode_); + if (legendaryKeyCount_ != 0) { + output.writeUInt32(2, legendaryKeyCount_); + } + for (int i = 0; i < lockedPersonalLineList_.size(); i++) { + output.writeMessage(7, lockedPersonalLineList_.get(i)); } if (getOngoingPersonalLineListList().size() > 0) { - output.writeUInt32NoTag(50); + output.writeUInt32NoTag(82); output.writeUInt32NoTag(ongoingPersonalLineListMemoizedSerializedSize); } for (int i = 0; i < ongoingPersonalLineList_.size(); i++) { output.writeUInt32NoTag(ongoingPersonalLineList_.getInt(i)); } - for (int i = 0; i < lockedPersonalLineList_.size(); i++) { - output.writeMessage(8, lockedPersonalLineList_.get(i)); + if (retcode_ != 0) { + output.writeInt32(11, retcode_); } if (curFinishedDailyTaskCount_ != 0) { - output.writeUInt32(11, curFinishedDailyTaskCount_); + output.writeUInt32(12, curFinishedDailyTaskCount_); + } + if (getBPBOJKLJAGAList().size() > 0) { + output.writeUInt32NoTag(106); + output.writeUInt32NoTag(bPBOJKLJAGAMemoizedSerializedSize); + } + for (int i = 0; i < bPBOJKLJAGA_.size(); i++) { + output.writeUInt32NoTag(bPBOJKLJAGA_.getInt(i)); } unknownFields.writeTo(output); } @@ -434,10 +583,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (legendaryKeyCount_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, legendaryKeyCount_); - } { int dataSize = 0; for (int i = 0; i < canBeUnlockedPersonalLineList_.size(); i++) { @@ -452,9 +597,13 @@ public int getSerializedSize() { } canBeUnlockedPersonalLineListMemoizedSerializedSize = dataSize; } - if (retcode_ != 0) { + if (legendaryKeyCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, retcode_); + .computeUInt32Size(2, legendaryKeyCount_); + } + for (int i = 0; i < lockedPersonalLineList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, lockedPersonalLineList_.get(i)); } { int dataSize = 0; @@ -470,13 +619,27 @@ public int getSerializedSize() { } ongoingPersonalLineListMemoizedSerializedSize = dataSize; } - for (int i = 0; i < lockedPersonalLineList_.size(); i++) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, lockedPersonalLineList_.get(i)); + .computeInt32Size(11, retcode_); } if (curFinishedDailyTaskCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, curFinishedDailyTaskCount_); + .computeUInt32Size(12, curFinishedDailyTaskCount_); + } + { + int dataSize = 0; + for (int i = 0; i < bPBOJKLJAGA_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(bPBOJKLJAGA_.getInt(i)); + } + size += dataSize; + if (!getBPBOJKLJAGAList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + bPBOJKLJAGAMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -495,16 +658,18 @@ public boolean equals(final java.lang.Object obj) { if (!getCanBeUnlockedPersonalLineListList() .equals(other.getCanBeUnlockedPersonalLineListList())) return false; - if (getRetcode() - != other.getRetcode()) return false; - if (getCurFinishedDailyTaskCount() - != other.getCurFinishedDailyTaskCount()) return false; if (getLegendaryKeyCount() != other.getLegendaryKeyCount()) return false; - if (!getOngoingPersonalLineListList() - .equals(other.getOngoingPersonalLineListList())) return false; if (!getLockedPersonalLineListList() .equals(other.getLockedPersonalLineListList())) return false; + if (!getOngoingPersonalLineListList() + .equals(other.getOngoingPersonalLineListList())) return false; + if (getRetcode() + != other.getRetcode()) return false; + if (getCurFinishedDailyTaskCount() + != other.getCurFinishedDailyTaskCount()) return false; + if (!getBPBOJKLJAGAList() + .equals(other.getBPBOJKLJAGAList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -520,20 +685,24 @@ public int hashCode() { hash = (37 * hash) + CAN_BE_UNLOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER; hash = (53 * hash) + getCanBeUnlockedPersonalLineListList().hashCode(); } - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + CUR_FINISHED_DAILY_TASK_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getCurFinishedDailyTaskCount(); hash = (37 * hash) + LEGENDARY_KEY_COUNT_FIELD_NUMBER; hash = (53 * hash) + getLegendaryKeyCount(); - if (getOngoingPersonalLineListCount() > 0) { - hash = (37 * hash) + ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER; - hash = (53 * hash) + getOngoingPersonalLineListList().hashCode(); - } if (getLockedPersonalLineListCount() > 0) { hash = (37 * hash) + LOCKED_PERSONAL_LINE_LIST_FIELD_NUMBER; hash = (53 * hash) + getLockedPersonalLineListList().hashCode(); } + if (getOngoingPersonalLineListCount() > 0) { + hash = (37 * hash) + ONGOING_PERSONAL_LINE_LIST_FIELD_NUMBER; + hash = (53 * hash) + getOngoingPersonalLineListList().hashCode(); + } + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + CUR_FINISHED_DAILY_TASK_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getCurFinishedDailyTaskCount(); + if (getBPBOJKLJAGACount() > 0) { + hash = (37 * hash) + BPBOJKLJAGA_FIELD_NUMBER; + hash = (53 * hash) + getBPBOJKLJAGAList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -631,8 +800,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20607
-     * Obf: EKHCNHLAPJL
+     * CmdId: 28577
+     * obf: AGDOIEMEJIN
      *
* * Protobuf type {@code PersonalLineAllDataRsp} @@ -675,20 +844,22 @@ public Builder clear() { super.clear(); canBeUnlockedPersonalLineList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - retcode_ = 0; - - curFinishedDailyTaskCount_ = 0; - legendaryKeyCount_ = 0; - ongoingPersonalLineList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); if (lockedPersonalLineListBuilder_ == null) { lockedPersonalLineList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); } else { lockedPersonalLineListBuilder_.clear(); } + ongoingPersonalLineList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000004); + retcode_ = 0; + + curFinishedDailyTaskCount_ = 0; + + bPBOJKLJAGA_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -721,23 +892,28 @@ public emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAl bitField0_ = (bitField0_ & ~0x00000001); } result.canBeUnlockedPersonalLineList_ = canBeUnlockedPersonalLineList_; - result.retcode_ = retcode_; - result.curFinishedDailyTaskCount_ = curFinishedDailyTaskCount_; result.legendaryKeyCount_ = legendaryKeyCount_; - if (((bitField0_ & 0x00000002) != 0)) { - ongoingPersonalLineList_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.ongoingPersonalLineList_ = ongoingPersonalLineList_; if (lockedPersonalLineListBuilder_ == null) { - if (((bitField0_ & 0x00000004) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { lockedPersonalLineList_ = java.util.Collections.unmodifiableList(lockedPersonalLineList_); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); } result.lockedPersonalLineList_ = lockedPersonalLineList_; } else { result.lockedPersonalLineList_ = lockedPersonalLineListBuilder_.build(); } + if (((bitField0_ & 0x00000004) != 0)) { + ongoingPersonalLineList_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.ongoingPersonalLineList_ = ongoingPersonalLineList_; + result.retcode_ = retcode_; + result.curFinishedDailyTaskCount_ = curFinishedDailyTaskCount_; + if (((bitField0_ & 0x00000008) != 0)) { + bPBOJKLJAGA_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.bPBOJKLJAGA_ = bPBOJKLJAGA_; onBuilt(); return result; } @@ -796,30 +972,14 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PersonalLineAllDataRspOuterCl } onChanged(); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } - if (other.getCurFinishedDailyTaskCount() != 0) { - setCurFinishedDailyTaskCount(other.getCurFinishedDailyTaskCount()); - } if (other.getLegendaryKeyCount() != 0) { setLegendaryKeyCount(other.getLegendaryKeyCount()); } - if (!other.ongoingPersonalLineList_.isEmpty()) { - if (ongoingPersonalLineList_.isEmpty()) { - ongoingPersonalLineList_ = other.ongoingPersonalLineList_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureOngoingPersonalLineListIsMutable(); - ongoingPersonalLineList_.addAll(other.ongoingPersonalLineList_); - } - onChanged(); - } if (lockedPersonalLineListBuilder_ == null) { if (!other.lockedPersonalLineList_.isEmpty()) { if (lockedPersonalLineList_.isEmpty()) { lockedPersonalLineList_ = other.lockedPersonalLineList_; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureLockedPersonalLineListIsMutable(); lockedPersonalLineList_.addAll(other.lockedPersonalLineList_); @@ -832,7 +992,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PersonalLineAllDataRspOuterCl lockedPersonalLineListBuilder_.dispose(); lockedPersonalLineListBuilder_ = null; lockedPersonalLineList_ = other.lockedPersonalLineList_; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); lockedPersonalLineListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getLockedPersonalLineListFieldBuilder() : null; @@ -841,6 +1001,32 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PersonalLineAllDataRspOuterCl } } } + if (!other.ongoingPersonalLineList_.isEmpty()) { + if (ongoingPersonalLineList_.isEmpty()) { + ongoingPersonalLineList_ = other.ongoingPersonalLineList_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureOngoingPersonalLineListIsMutable(); + ongoingPersonalLineList_.addAll(other.ongoingPersonalLineList_); + } + onChanged(); + } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } + if (other.getCurFinishedDailyTaskCount() != 0) { + setCurFinishedDailyTaskCount(other.getCurFinishedDailyTaskCount()); + } + if (!other.bPBOJKLJAGA_.isEmpty()) { + if (bPBOJKLJAGA_.isEmpty()) { + bPBOJKLJAGA_ = other.bPBOJKLJAGA_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureBPBOJKLJAGAIsMutable(); + bPBOJKLJAGA_.addAll(other.bPBOJKLJAGA_); + } + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -879,7 +1065,11 @@ private void ensureCanBeUnlockedPersonalLineListIsMutable() { } } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+       * obf: INEIKFAFMEO 解出来的可能不对
+       *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @return A list containing the canBeUnlockedPersonalLineList. */ public java.util.List @@ -888,14 +1078,22 @@ private void ensureCanBeUnlockedPersonalLineListIsMutable() { java.util.Collections.unmodifiableList(canBeUnlockedPersonalLineList_) : canBeUnlockedPersonalLineList_; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+       * obf: INEIKFAFMEO 解出来的可能不对
+       *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @return The count of canBeUnlockedPersonalLineList. */ public int getCanBeUnlockedPersonalLineListCount() { return canBeUnlockedPersonalLineList_.size(); } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+       * obf: INEIKFAFMEO 解出来的可能不对
+       *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @param index The index of the element to return. * @return The canBeUnlockedPersonalLineList at the given index. */ @@ -903,7 +1101,11 @@ public int getCanBeUnlockedPersonalLineList(int index) { return canBeUnlockedPersonalLineList_.getInt(index); } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+       * obf: INEIKFAFMEO 解出来的可能不对
+       *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @param index The index to set the value at. * @param value The canBeUnlockedPersonalLineList to set. * @return This builder for chaining. @@ -916,7 +1118,11 @@ public Builder setCanBeUnlockedPersonalLineList( return this; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+       * obf: INEIKFAFMEO 解出来的可能不对
+       *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @param value The canBeUnlockedPersonalLineList to add. * @return This builder for chaining. */ @@ -927,7 +1133,11 @@ public Builder addCanBeUnlockedPersonalLineList(int value) { return this; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+       * obf: INEIKFAFMEO 解出来的可能不对
+       *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @param values The canBeUnlockedPersonalLineList to add. * @return This builder for chaining. */ @@ -940,7 +1150,11 @@ public Builder addAllCanBeUnlockedPersonalLineList( return this; } /** - * repeated uint32 can_be_unlocked_personal_line_list = 2; + * 
+       * obf: INEIKFAFMEO 解出来的可能不对
+       *
+ * + * repeated uint32 can_be_unlocked_personal_line_list = 1; * @return This builder for chaining. */ public Builder clearCanBeUnlockedPersonalLineList() { @@ -950,71 +1164,9 @@ public Builder clearCanBeUnlockedPersonalLineList() { return this; } - private int retcode_ ; - /** - * int32 retcode = 3; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 3; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 3; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - - private int curFinishedDailyTaskCount_ ; - /** - * uint32 cur_finished_daily_task_count = 11; - * @return The curFinishedDailyTaskCount. - */ - @java.lang.Override - public int getCurFinishedDailyTaskCount() { - return curFinishedDailyTaskCount_; - } - /** - * uint32 cur_finished_daily_task_count = 11; - * @param value The curFinishedDailyTaskCount to set. - * @return This builder for chaining. - */ - public Builder setCurFinishedDailyTaskCount(int value) { - - curFinishedDailyTaskCount_ = value; - onChanged(); - return this; - } - /** - * uint32 cur_finished_daily_task_count = 11; - * @return This builder for chaining. - */ - public Builder clearCurFinishedDailyTaskCount() { - - curFinishedDailyTaskCount_ = 0; - onChanged(); - return this; - } - private int legendaryKeyCount_ ; /** - * uint32 legendary_key_count = 1; + * uint32 legendary_key_count = 2; * @return The legendaryKeyCount. */ @java.lang.Override @@ -1022,7 +1174,7 @@ public int getLegendaryKeyCount() { return legendaryKeyCount_; } /** - * uint32 legendary_key_count = 1; + * uint32 legendary_key_count = 2; * @param value The legendaryKeyCount to set. * @return This builder for chaining. */ @@ -1033,7 +1185,7 @@ public Builder setLegendaryKeyCount(int value) { return this; } /** - * uint32 legendary_key_count = 1; + * uint32 legendary_key_count = 2; * @return This builder for chaining. */ public Builder clearLegendaryKeyCount() { @@ -1043,91 +1195,12 @@ public Builder clearLegendaryKeyCount() { return this; } - private com.google.protobuf.Internal.IntList ongoingPersonalLineList_ = emptyIntList(); - private void ensureOngoingPersonalLineListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - ongoingPersonalLineList_ = mutableCopy(ongoingPersonalLineList_); - bitField0_ |= 0x00000002; - } - } - /** - * repeated uint32 ongoing_personal_line_list = 6; - * @return A list containing the ongoingPersonalLineList. - */ - public java.util.List - getOngoingPersonalLineListList() { - return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(ongoingPersonalLineList_) : ongoingPersonalLineList_; - } - /** - * repeated uint32 ongoing_personal_line_list = 6; - * @return The count of ongoingPersonalLineList. - */ - public int getOngoingPersonalLineListCount() { - return ongoingPersonalLineList_.size(); - } - /** - * repeated uint32 ongoing_personal_line_list = 6; - * @param index The index of the element to return. - * @return The ongoingPersonalLineList at the given index. - */ - public int getOngoingPersonalLineList(int index) { - return ongoingPersonalLineList_.getInt(index); - } - /** - * repeated uint32 ongoing_personal_line_list = 6; - * @param index The index to set the value at. - * @param value The ongoingPersonalLineList to set. - * @return This builder for chaining. - */ - public Builder setOngoingPersonalLineList( - int index, int value) { - ensureOngoingPersonalLineListIsMutable(); - ongoingPersonalLineList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 ongoing_personal_line_list = 6; - * @param value The ongoingPersonalLineList to add. - * @return This builder for chaining. - */ - public Builder addOngoingPersonalLineList(int value) { - ensureOngoingPersonalLineListIsMutable(); - ongoingPersonalLineList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 ongoing_personal_line_list = 6; - * @param values The ongoingPersonalLineList to add. - * @return This builder for chaining. - */ - public Builder addAllOngoingPersonalLineList( - java.lang.Iterable values) { - ensureOngoingPersonalLineListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, ongoingPersonalLineList_); - onChanged(); - return this; - } - /** - * repeated uint32 ongoing_personal_line_list = 6; - * @return This builder for chaining. - */ - public Builder clearOngoingPersonalLineList() { - ongoingPersonalLineList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); - onChanged(); - return this; - } - private java.util.List lockedPersonalLineList_ = java.util.Collections.emptyList(); private void ensureLockedPersonalLineListIsMutable() { - if (!((bitField0_ & 0x00000004) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { lockedPersonalLineList_ = new java.util.ArrayList(lockedPersonalLineList_); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000002; } } @@ -1135,7 +1208,7 @@ private void ensureLockedPersonalLineListIsMutable() { emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.Builder, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineDataOrBuilder> lockedPersonalLineListBuilder_; /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public java.util.List getLockedPersonalLineListList() { if (lockedPersonalLineListBuilder_ == null) { @@ -1145,7 +1218,7 @@ public java.util.Listrepeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public int getLockedPersonalLineListCount() { if (lockedPersonalLineListBuilder_ == null) { @@ -1155,7 +1228,7 @@ public int getLockedPersonalLineListCount() { } } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData getLockedPersonalLineList(int index) { if (lockedPersonalLineListBuilder_ == null) { @@ -1165,7 +1238,7 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal } } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder setLockedPersonalLineList( int index, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData value) { @@ -1182,7 +1255,7 @@ public Builder setLockedPersonalLineList( return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder setLockedPersonalLineList( int index, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.Builder builderForValue) { @@ -1196,7 +1269,7 @@ public Builder setLockedPersonalLineList( return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder addLockedPersonalLineList(emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData value) { if (lockedPersonalLineListBuilder_ == null) { @@ -1212,7 +1285,7 @@ public Builder addLockedPersonalLineList(emu.grasscutter.net.proto.LockedPersona return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder addLockedPersonalLineList( int index, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData value) { @@ -1229,7 +1302,7 @@ public Builder addLockedPersonalLineList( return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder addLockedPersonalLineList( emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.Builder builderForValue) { @@ -1243,7 +1316,7 @@ public Builder addLockedPersonalLineList( return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder addLockedPersonalLineList( int index, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.Builder builderForValue) { @@ -1257,7 +1330,7 @@ public Builder addLockedPersonalLineList( return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder addAllLockedPersonalLineList( java.lang.Iterable values) { @@ -1272,12 +1345,12 @@ public Builder addAllLockedPersonalLineList( return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder clearLockedPersonalLineList() { if (lockedPersonalLineListBuilder_ == null) { lockedPersonalLineList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { lockedPersonalLineListBuilder_.clear(); @@ -1285,7 +1358,7 @@ public Builder clearLockedPersonalLineList() { return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public Builder removeLockedPersonalLineList(int index) { if (lockedPersonalLineListBuilder_ == null) { @@ -1298,14 +1371,14 @@ public Builder removeLockedPersonalLineList(int index) { return this; } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.Builder getLockedPersonalLineListBuilder( int index) { return getLockedPersonalLineListFieldBuilder().getBuilder(index); } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineDataOrBuilder getLockedPersonalLineListOrBuilder( int index) { @@ -1315,7 +1388,7 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal } } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public java.util.List getLockedPersonalLineListOrBuilderList() { @@ -1326,14 +1399,14 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal } } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.Builder addLockedPersonalLineListBuilder() { return getLockedPersonalLineListFieldBuilder().addBuilder( emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.getDefaultInstance()); } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.Builder addLockedPersonalLineListBuilder( int index) { @@ -1341,7 +1414,7 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal index, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.getDefaultInstance()); } /** - * repeated .LockedPersonallineData locked_personal_line_list = 8; + * repeated .LockedPersonallineData locked_personal_line_list = 7; */ public java.util.List getLockedPersonalLineListBuilderList() { @@ -1354,13 +1427,289 @@ public emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonal lockedPersonalLineListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineData.Builder, emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.LockedPersonallineDataOrBuilder>( lockedPersonalLineList_, - ((bitField0_ & 0x00000004) != 0), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); lockedPersonalLineList_ = null; } return lockedPersonalLineListBuilder_; } + + private com.google.protobuf.Internal.IntList ongoingPersonalLineList_ = emptyIntList(); + private void ensureOngoingPersonalLineListIsMutable() { + if (!((bitField0_ & 0x00000004) != 0)) { + ongoingPersonalLineList_ = mutableCopy(ongoingPersonalLineList_); + bitField0_ |= 0x00000004; + } + } + /** + * 
+       * obf: JHPDOHCMKEC 解出来的可能不对
+       *
+ * + * repeated uint32 ongoing_personal_line_list = 10; + * @return A list containing the ongoingPersonalLineList. + */ + public java.util.List + getOngoingPersonalLineListList() { + return ((bitField0_ & 0x00000004) != 0) ? + java.util.Collections.unmodifiableList(ongoingPersonalLineList_) : ongoingPersonalLineList_; + } + /** + * 
+       * obf: JHPDOHCMKEC 解出来的可能不对
+       *
+ * + * repeated uint32 ongoing_personal_line_list = 10; + * @return The count of ongoingPersonalLineList. + */ + public int getOngoingPersonalLineListCount() { + return ongoingPersonalLineList_.size(); + } + /** + * 
+       * obf: JHPDOHCMKEC 解出来的可能不对
+       *
+ * + * repeated uint32 ongoing_personal_line_list = 10; + * @param index The index of the element to return. + * @return The ongoingPersonalLineList at the given index. + */ + public int getOngoingPersonalLineList(int index) { + return ongoingPersonalLineList_.getInt(index); + } + /** + * 
+       * obf: JHPDOHCMKEC 解出来的可能不对
+       *
+ * + * repeated uint32 ongoing_personal_line_list = 10; + * @param index The index to set the value at. + * @param value The ongoingPersonalLineList to set. + * @return This builder for chaining. + */ + public Builder setOngoingPersonalLineList( + int index, int value) { + ensureOngoingPersonalLineListIsMutable(); + ongoingPersonalLineList_.setInt(index, value); + onChanged(); + return this; + } + /** + * 
+       * obf: JHPDOHCMKEC 解出来的可能不对
+       *
+ * + * repeated uint32 ongoing_personal_line_list = 10; + * @param value The ongoingPersonalLineList to add. + * @return This builder for chaining. + */ + public Builder addOngoingPersonalLineList(int value) { + ensureOngoingPersonalLineListIsMutable(); + ongoingPersonalLineList_.addInt(value); + onChanged(); + return this; + } + /** + * 
+       * obf: JHPDOHCMKEC 解出来的可能不对
+       *
+ * + * repeated uint32 ongoing_personal_line_list = 10; + * @param values The ongoingPersonalLineList to add. + * @return This builder for chaining. + */ + public Builder addAllOngoingPersonalLineList( + java.lang.Iterable values) { + ensureOngoingPersonalLineListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, ongoingPersonalLineList_); + onChanged(); + return this; + } + /** + * 
+       * obf: JHPDOHCMKEC 解出来的可能不对
+       *
+ * + * repeated uint32 ongoing_personal_line_list = 10; + * @return This builder for chaining. + */ + public Builder clearOngoingPersonalLineList() { + ongoingPersonalLineList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 11; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 11; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 11; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + + private int curFinishedDailyTaskCount_ ; + /** + * uint32 cur_finished_daily_task_count = 12; + * @return The curFinishedDailyTaskCount. + */ + @java.lang.Override + public int getCurFinishedDailyTaskCount() { + return curFinishedDailyTaskCount_; + } + /** + * uint32 cur_finished_daily_task_count = 12; + * @param value The curFinishedDailyTaskCount to set. + * @return This builder for chaining. + */ + public Builder setCurFinishedDailyTaskCount(int value) { + + curFinishedDailyTaskCount_ = value; + onChanged(); + return this; + } + /** + * uint32 cur_finished_daily_task_count = 12; + * @return This builder for chaining. + */ + public Builder clearCurFinishedDailyTaskCount() { + + curFinishedDailyTaskCount_ = 0; + onChanged(); + return this; + } + + private com.google.protobuf.Internal.IntList bPBOJKLJAGA_ = emptyIntList(); + private void ensureBPBOJKLJAGAIsMutable() { + if (!((bitField0_ & 0x00000008) != 0)) { + bPBOJKLJAGA_ = mutableCopy(bPBOJKLJAGA_); + bitField0_ |= 0x00000008; + } + } + /** + * 
+       * obf: BPBOJKLJAGA 解出来的可能不对
+       *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @return A list containing the bPBOJKLJAGA. + */ + public java.util.List + getBPBOJKLJAGAList() { + return ((bitField0_ & 0x00000008) != 0) ? + java.util.Collections.unmodifiableList(bPBOJKLJAGA_) : bPBOJKLJAGA_; + } + /** + * 
+       * obf: BPBOJKLJAGA 解出来的可能不对
+       *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @return The count of bPBOJKLJAGA. + */ + public int getBPBOJKLJAGACount() { + return bPBOJKLJAGA_.size(); + } + /** + * 
+       * obf: BPBOJKLJAGA 解出来的可能不对
+       *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @param index The index of the element to return. + * @return The bPBOJKLJAGA at the given index. + */ + public int getBPBOJKLJAGA(int index) { + return bPBOJKLJAGA_.getInt(index); + } + /** + * 
+       * obf: BPBOJKLJAGA 解出来的可能不对
+       *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @param index The index to set the value at. + * @param value The bPBOJKLJAGA to set. + * @return This builder for chaining. + */ + public Builder setBPBOJKLJAGA( + int index, int value) { + ensureBPBOJKLJAGAIsMutable(); + bPBOJKLJAGA_.setInt(index, value); + onChanged(); + return this; + } + /** + * 
+       * obf: BPBOJKLJAGA 解出来的可能不对
+       *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @param value The bPBOJKLJAGA to add. + * @return This builder for chaining. + */ + public Builder addBPBOJKLJAGA(int value) { + ensureBPBOJKLJAGAIsMutable(); + bPBOJKLJAGA_.addInt(value); + onChanged(); + return this; + } + /** + * 
+       * obf: BPBOJKLJAGA 解出来的可能不对
+       *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @param values The bPBOJKLJAGA to add. + * @return This builder for chaining. + */ + public Builder addAllBPBOJKLJAGA( + java.lang.Iterable values) { + ensureBPBOJKLJAGAIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, bPBOJKLJAGA_); + onChanged(); + return this; + } + /** + * 
+       * obf: BPBOJKLJAGA 解出来的可能不对
+       *
+ * + * repeated uint32 BPBOJKLJAGA = 13; + * @return This builder for chaining. + */ + public Builder clearBPBOJKLJAGA() { + bPBOJKLJAGA_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1429,14 +1778,15 @@ public emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAl static { java.lang.String[] descriptorData = { "\n\034PersonalLineAllDataRsp.proto\032\034LockedPe" + - "rsonallineData.proto\"\371\001\n\026PersonalLineAll" + + "rsonallineData.proto\"\216\002\n\026PersonalLineAll" + "DataRsp\022*\n\"can_be_unlocked_personal_line" + - "_list\030\002 \003(\r\022\017\n\007retcode\030\003 \001(\005\022%\n\035cur_fini" + - "shed_daily_task_count\030\013 \001(\r\022\033\n\023legendary" + - "_key_count\030\001 \001(\r\022\"\n\032ongoing_personal_lin" + - "e_list\030\006 \003(\r\022:\n\031locked_personal_line_lis" + - "t\030\010 \003(\0132\027.LockedPersonallineDataB\033\n\031emu." + - "grasscutter.net.protob\006proto3" + "_list\030\001 \003(\r\022\033\n\023legendary_key_count\030\002 \001(\r" + + "\022:\n\031locked_personal_line_list\030\007 \003(\0132\027.Lo" + + "ckedPersonallineData\022\"\n\032ongoing_personal" + + "_line_list\030\n \003(\r\022\017\n\007retcode\030\013 \001(\005\022%\n\035cur" + + "_finished_daily_task_count\030\014 \001(\r\022\023\n\013BPBO" + + "JKLJAGA\030\r \003(\rB\033\n\031emu.grasscutter.net.pro" + + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1448,7 +1798,7 @@ public emu.grasscutter.net.proto.PersonalLineAllDataRspOuterClass.PersonalLineAl internal_static_PersonalLineAllDataRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PersonalLineAllDataRsp_descriptor, - new java.lang.String[] { "CanBeUnlockedPersonalLineList", "Retcode", "CurFinishedDailyTaskCount", "LegendaryKeyCount", "OngoingPersonalLineList", "LockedPersonalLineList", }); + new java.lang.String[] { "CanBeUnlockedPersonalLineList", "LegendaryKeyCount", "LockedPersonalLineList", "OngoingPersonalLineList", "Retcode", "CurFinishedDailyTaskCount", "BPBOJKLJAGA", }); emu.grasscutter.net.proto.LockedPersonallineDataOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpRspOuterClass.java index ec06a57e76a..f9a563a4935 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpRspOuterClass.java @@ -19,36 +19,36 @@ public interface PersonalSceneJumpRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 dest_scene_id = 6; - * @return The destSceneId. - */ - int getDestSceneId(); - - /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; * @return Whether the destPos field is set. */ boolean hasDestPos(); /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; * @return The destPos. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getDestPos(); /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestPosOrBuilder(); /** - * int32 retcode = 8; + * uint32 dest_scene_id = 2; + * @return The destSceneId. + */ + int getDestSceneId(); + + /** + * int32 retcode = 6; * @return The retcode. */ int getRetcode(); } /** * 
-   * CmdId: 26151
-   * Obf: FENDEOICMKE
+   * CmdId: 1612
+   * obf: OICHHKCLLGA
    *
* * Protobuf type {@code PersonalSceneJumpRsp} @@ -95,17 +95,7 @@ private PersonalSceneJumpRsp( case 0: done = true; break; - case 48: { - - destSceneId_ = input.readUInt32(); - break; - } - case 64: { - - retcode_ = input.readInt32(); - break; - } - case 114: { + case 10: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (destPos_ != null) { subBuilder = destPos_.toBuilder(); @@ -118,6 +108,16 @@ private PersonalSceneJumpRsp( break; } + case 16: { + + destSceneId_ = input.readUInt32(); + break; + } + case 48: { + + retcode_ = input.readInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -150,21 +150,10 @@ private PersonalSceneJumpRsp( emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp.class, emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp.Builder.class); } - public static final int DEST_SCENE_ID_FIELD_NUMBER = 6; - private int destSceneId_; - /** - * uint32 dest_scene_id = 6; - * @return The destSceneId. - */ - @java.lang.Override - public int getDestSceneId() { - return destSceneId_; - } - - public static final int DEST_POS_FIELD_NUMBER = 14; + public static final int DEST_POS_FIELD_NUMBER = 1; private emu.grasscutter.net.proto.VectorOuterClass.Vector destPos_; /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; * @return Whether the destPos field is set. */ @java.lang.Override @@ -172,7 +161,7 @@ public boolean hasDestPos() { return destPos_ != null; } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; * @return The destPos. */ @java.lang.Override @@ -180,17 +169,28 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestPos() { return destPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : destPos_; } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ @java.lang.Override public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestPosOrBuilder() { return getDestPos(); } - public static final int RETCODE_FIELD_NUMBER = 8; + public static final int DEST_SCENE_ID_FIELD_NUMBER = 2; + private int destSceneId_; + /** + * uint32 dest_scene_id = 2; + * @return The destSceneId. + */ + @java.lang.Override + public int getDestSceneId() { + return destSceneId_; + } + + public static final int RETCODE_FIELD_NUMBER = 6; private int retcode_; /** - * int32 retcode = 8; + * int32 retcode = 6; * @return The retcode. */ @java.lang.Override @@ -212,14 +212,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (destPos_ != null) { + output.writeMessage(1, getDestPos()); + } if (destSceneId_ != 0) { - output.writeUInt32(6, destSceneId_); + output.writeUInt32(2, destSceneId_); } if (retcode_ != 0) { - output.writeInt32(8, retcode_); - } - if (destPos_ != null) { - output.writeMessage(14, getDestPos()); + output.writeInt32(6, retcode_); } unknownFields.writeTo(output); } @@ -230,17 +230,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (destSceneId_ != 0) { + if (destPos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, destSceneId_); + .computeMessageSize(1, getDestPos()); } - if (retcode_ != 0) { + if (destSceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(8, retcode_); + .computeUInt32Size(2, destSceneId_); } - if (destPos_ != null) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, getDestPos()); + .computeInt32Size(6, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -257,13 +257,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp other = (emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp) obj; - if (getDestSceneId() - != other.getDestSceneId()) return false; if (hasDestPos() != other.hasDestPos()) return false; if (hasDestPos()) { if (!getDestPos() .equals(other.getDestPos())) return false; } + if (getDestSceneId() + != other.getDestSceneId()) return false; if (getRetcode() != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -277,12 +277,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + DEST_SCENE_ID_FIELD_NUMBER; - hash = (53 * hash) + getDestSceneId(); if (hasDestPos()) { hash = (37 * hash) + DEST_POS_FIELD_NUMBER; hash = (53 * hash) + getDestPos().hashCode(); } + hash = (37 * hash) + DEST_SCENE_ID_FIELD_NUMBER; + hash = (53 * hash) + getDestSceneId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); @@ -382,8 +382,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 26151
-     * Obf: FENDEOICMKE
+     * CmdId: 1612
+     * obf: OICHHKCLLGA
      *
* * Protobuf type {@code PersonalSceneJumpRsp} @@ -423,14 +423,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - destSceneId_ = 0; - if (destPosBuilder_ == null) { destPos_ = null; } else { destPos_ = null; destPosBuilder_ = null; } + destSceneId_ = 0; + retcode_ = 0; return this; @@ -459,12 +459,12 @@ public emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJum @java.lang.Override public emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp buildPartial() { emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp result = new emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp(this); - result.destSceneId_ = destSceneId_; if (destPosBuilder_ == null) { result.destPos_ = destPos_; } else { result.destPos_ = destPosBuilder_.build(); } + result.destSceneId_ = destSceneId_; result.retcode_ = retcode_; onBuilt(); return result; @@ -514,12 +514,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp other) { if (other == emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJumpRsp.getDefaultInstance()) return this; - if (other.getDestSceneId() != 0) { - setDestSceneId(other.getDestSceneId()); - } if (other.hasDestPos()) { mergeDestPos(other.getDestPos()); } + if (other.getDestSceneId() != 0) { + setDestSceneId(other.getDestSceneId()); + } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } @@ -552,49 +552,18 @@ public Builder mergeFrom( return this; } - private int destSceneId_ ; - /** - * uint32 dest_scene_id = 6; - * @return The destSceneId. - */ - @java.lang.Override - public int getDestSceneId() { - return destSceneId_; - } - /** - * uint32 dest_scene_id = 6; - * @param value The destSceneId to set. - * @return This builder for chaining. - */ - public Builder setDestSceneId(int value) { - - destSceneId_ = value; - onChanged(); - return this; - } - /** - * uint32 dest_scene_id = 6; - * @return This builder for chaining. - */ - public Builder clearDestSceneId() { - - destSceneId_ = 0; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.VectorOuterClass.Vector destPos_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> destPosBuilder_; /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; * @return Whether the destPos field is set. */ public boolean hasDestPos() { return destPosBuilder_ != null || destPos_ != null; } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; * @return The destPos. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestPos() { @@ -605,7 +574,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestPos() { } } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ public Builder setDestPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (destPosBuilder_ == null) { @@ -621,7 +590,7 @@ public Builder setDestPos(emu.grasscutter.net.proto.VectorOuterClass.Vector valu return this; } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ public Builder setDestPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -635,7 +604,7 @@ public Builder setDestPos( return this; } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ public Builder mergeDestPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (destPosBuilder_ == null) { @@ -653,7 +622,7 @@ public Builder mergeDestPos(emu.grasscutter.net.proto.VectorOuterClass.Vector va return this; } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ public Builder clearDestPos() { if (destPosBuilder_ == null) { @@ -667,7 +636,7 @@ public Builder clearDestPos() { return this; } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDestPosBuilder() { @@ -675,7 +644,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDestPosBuild return getDestPosFieldBuilder().getBuilder(); } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestPosOrBuilder() { if (destPosBuilder_ != null) { @@ -686,7 +655,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestPosOrBu } } /** - * .Vector dest_pos = 14; + * .Vector dest_pos = 1; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -702,9 +671,40 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestPosOrBu return destPosBuilder_; } + private int destSceneId_ ; + /** + * uint32 dest_scene_id = 2; + * @return The destSceneId. + */ + @java.lang.Override + public int getDestSceneId() { + return destSceneId_; + } + /** + * uint32 dest_scene_id = 2; + * @param value The destSceneId to set. + * @return This builder for chaining. + */ + public Builder setDestSceneId(int value) { + + destSceneId_ = value; + onChanged(); + return this; + } + /** + * uint32 dest_scene_id = 2; + * @return This builder for chaining. + */ + public Builder clearDestSceneId() { + + destSceneId_ = 0; + onChanged(); + return this; + } + private int retcode_ ; /** - * int32 retcode = 8; + * int32 retcode = 6; * @return The retcode. */ @java.lang.Override @@ -712,7 +712,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 8; + * int32 retcode = 6; * @param value The retcode to set. * @return This builder for chaining. */ @@ -723,7 +723,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 8; + * int32 retcode = 6; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -800,9 +800,9 @@ public emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJum static { java.lang.String[] descriptorData = { "\n\032PersonalSceneJumpRsp.proto\032\014Vector.pro" + - "to\"Y\n\024PersonalSceneJumpRsp\022\025\n\rdest_scene" + - "_id\030\006 \001(\r\022\031\n\010dest_pos\030\016 \001(\0132\007.Vector\022\017\n\007" + - "retcode\030\010 \001(\005B\033\n\031emu.grasscutter.net.pro" + + "to\"Y\n\024PersonalSceneJumpRsp\022\031\n\010dest_pos\030\001" + + " \001(\0132\007.Vector\022\025\n\rdest_scene_id\030\002 \001(\r\022\017\n\007" + + "retcode\030\006 \001(\005B\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -815,7 +815,7 @@ public emu.grasscutter.net.proto.PersonalSceneJumpRspOuterClass.PersonalSceneJum internal_static_PersonalSceneJumpRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PersonalSceneJumpRsp_descriptor, - new java.lang.String[] { "DestSceneId", "DestPos", "Retcode", }); + new java.lang.String[] { "DestPos", "DestSceneId", "Retcode", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlatformStartRouteNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlatformStartRouteNotifyOuterClass.java index 5d4f5a5e838..64949e8263d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlatformStartRouteNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlatformStartRouteNotifyOuterClass.java @@ -19,36 +19,35 @@ public interface PlatformStartRouteNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 entity_id = 14; - * @return The entityId. + * uint32 scene_time = 3; + * @return The sceneTime. */ - int getEntityId(); + int getSceneTime(); /** - * uint32 scene_time = 4; - * @return The sceneTime. + * uint32 entity_id = 6; + * @return The entityId. */ - int getSceneTime(); + int getEntityId(); /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; * @return Whether the platform field is set. */ boolean hasPlatform(); /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; * @return The platform. */ emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo getPlatform(); /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfoOrBuilder getPlatformOrBuilder(); } /** * 
-   * CmdId: 7427
-   * Obf: PPPKGDJOODM
+   * CmdId: 2989
    *
* * Protobuf type {@code PlatformStartRouteNotify} @@ -95,12 +94,17 @@ private PlatformStartRouteNotify( case 0: done = true; break; - case 32: { + case 24: { sceneTime_ = input.readUInt32(); break; } - case 82: { + case 48: { + + entityId_ = input.readUInt32(); + break; + } + case 90: { emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo.Builder subBuilder = null; if (platform_ != null) { subBuilder = platform_.toBuilder(); @@ -113,11 +117,6 @@ private PlatformStartRouteNotify( break; } - case 112: { - - entityId_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -150,32 +149,32 @@ private PlatformStartRouteNotify( emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify.class, emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify.Builder.class); } - public static final int ENTITY_ID_FIELD_NUMBER = 14; - private int entityId_; + public static final int SCENE_TIME_FIELD_NUMBER = 3; + private int sceneTime_; /** - * uint32 entity_id = 14; - * @return The entityId. + * uint32 scene_time = 3; + * @return The sceneTime. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getSceneTime() { + return sceneTime_; } - public static final int SCENE_TIME_FIELD_NUMBER = 4; - private int sceneTime_; + public static final int ENTITY_ID_FIELD_NUMBER = 6; + private int entityId_; /** - * uint32 scene_time = 4; - * @return The sceneTime. + * uint32 entity_id = 6; + * @return The entityId. */ @java.lang.Override - public int getSceneTime() { - return sceneTime_; + public int getEntityId() { + return entityId_; } - public static final int PLATFORM_FIELD_NUMBER = 10; + public static final int PLATFORM_FIELD_NUMBER = 11; private emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo platform_; /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; * @return Whether the platform field is set. */ @java.lang.Override @@ -183,7 +182,7 @@ public boolean hasPlatform() { return platform_ != null; } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; * @return The platform. */ @java.lang.Override @@ -191,7 +190,7 @@ public emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo getPlatform return platform_ == null ? emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo.getDefaultInstance() : platform_; } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ @java.lang.Override public emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfoOrBuilder getPlatformOrBuilder() { @@ -213,13 +212,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (sceneTime_ != 0) { - output.writeUInt32(4, sceneTime_); - } - if (platform_ != null) { - output.writeMessage(10, getPlatform()); + output.writeUInt32(3, sceneTime_); } if (entityId_ != 0) { - output.writeUInt32(14, entityId_); + output.writeUInt32(6, entityId_); + } + if (platform_ != null) { + output.writeMessage(11, getPlatform()); } unknownFields.writeTo(output); } @@ -232,15 +231,15 @@ public int getSerializedSize() { size = 0; if (sceneTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, sceneTime_); + .computeUInt32Size(3, sceneTime_); } - if (platform_ != null) { + if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, getPlatform()); + .computeUInt32Size(6, entityId_); } - if (entityId_ != 0) { + if (platform_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, entityId_); + .computeMessageSize(11, getPlatform()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -257,10 +256,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify other = (emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify) obj; - if (getEntityId() - != other.getEntityId()) return false; if (getSceneTime() != other.getSceneTime()) return false; + if (getEntityId() + != other.getEntityId()) return false; if (hasPlatform() != other.hasPlatform()) return false; if (hasPlatform()) { if (!getPlatform() @@ -277,10 +276,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); hash = (37 * hash) + SCENE_TIME_FIELD_NUMBER; hash = (53 * hash) + getSceneTime(); + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); if (hasPlatform()) { hash = (37 * hash) + PLATFORM_FIELD_NUMBER; hash = (53 * hash) + getPlatform().hashCode(); @@ -382,8 +381,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7427
-     * Obf: PPPKGDJOODM
+     * CmdId: 2989
      *
* * Protobuf type {@code PlatformStartRouteNotify} @@ -423,10 +421,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - entityId_ = 0; - sceneTime_ = 0; + entityId_ = 0; + if (platformBuilder_ == null) { platform_ = null; } else { @@ -459,8 +457,8 @@ public emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStar @java.lang.Override public emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify buildPartial() { emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify result = new emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify(this); - result.entityId_ = entityId_; result.sceneTime_ = sceneTime_; + result.entityId_ = entityId_; if (platformBuilder_ == null) { result.platform_ = platform_; } else { @@ -514,12 +512,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify other) { if (other == emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStartRouteNotify.getDefaultInstance()) return this; - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); - } if (other.getSceneTime() != 0) { setSceneTime(other.getSceneTime()); } + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); + } if (other.hasPlatform()) { mergePlatform(other.getPlatform()); } @@ -552,64 +550,64 @@ public Builder mergeFrom( return this; } - private int entityId_ ; + private int sceneTime_ ; /** - * uint32 entity_id = 14; - * @return The entityId. + * uint32 scene_time = 3; + * @return The sceneTime. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getSceneTime() { + return sceneTime_; } /** - * uint32 entity_id = 14; - * @param value The entityId to set. + * uint32 scene_time = 3; + * @param value The sceneTime to set. * @return This builder for chaining. */ - public Builder setEntityId(int value) { + public Builder setSceneTime(int value) { - entityId_ = value; + sceneTime_ = value; onChanged(); return this; } /** - * uint32 entity_id = 14; + * uint32 scene_time = 3; * @return This builder for chaining. */ - public Builder clearEntityId() { + public Builder clearSceneTime() { - entityId_ = 0; + sceneTime_ = 0; onChanged(); return this; } - private int sceneTime_ ; + private int entityId_ ; /** - * uint32 scene_time = 4; - * @return The sceneTime. + * uint32 entity_id = 6; + * @return The entityId. */ @java.lang.Override - public int getSceneTime() { - return sceneTime_; + public int getEntityId() { + return entityId_; } /** - * uint32 scene_time = 4; - * @param value The sceneTime to set. + * uint32 entity_id = 6; + * @param value The entityId to set. * @return This builder for chaining. */ - public Builder setSceneTime(int value) { + public Builder setEntityId(int value) { - sceneTime_ = value; + entityId_ = value; onChanged(); return this; } /** - * uint32 scene_time = 4; + * uint32 entity_id = 6; * @return This builder for chaining. */ - public Builder clearSceneTime() { + public Builder clearEntityId() { - sceneTime_ = 0; + entityId_ = 0; onChanged(); return this; } @@ -618,14 +616,14 @@ public Builder clearSceneTime() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo, emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo.Builder, emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfoOrBuilder> platformBuilder_; /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; * @return Whether the platform field is set. */ public boolean hasPlatform() { return platformBuilder_ != null || platform_ != null; } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; * @return The platform. */ public emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo getPlatform() { @@ -636,7 +634,7 @@ public emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo getPlatform } } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ public Builder setPlatform(emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo value) { if (platformBuilder_ == null) { @@ -652,7 +650,7 @@ public Builder setPlatform(emu.grasscutter.net.proto.PlatformInfoOuterClass.Plat return this; } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ public Builder setPlatform( emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo.Builder builderForValue) { @@ -666,7 +664,7 @@ public Builder setPlatform( return this; } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ public Builder mergePlatform(emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo value) { if (platformBuilder_ == null) { @@ -684,7 +682,7 @@ public Builder mergePlatform(emu.grasscutter.net.proto.PlatformInfoOuterClass.Pl return this; } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ public Builder clearPlatform() { if (platformBuilder_ == null) { @@ -698,7 +696,7 @@ public Builder clearPlatform() { return this; } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ public emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo.Builder getPlatformBuilder() { @@ -706,7 +704,7 @@ public emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo.Builder get return getPlatformFieldBuilder().getBuilder(); } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ public emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfoOrBuilder getPlatformOrBuilder() { if (platformBuilder_ != null) { @@ -717,7 +715,7 @@ public emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfoOrBuilder ge } } /** - * .PlatformInfo platform = 10; + * .PlatformInfo platform = 11; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo, emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfo.Builder, emu.grasscutter.net.proto.PlatformInfoOuterClass.PlatformInfoOrBuilder> @@ -801,8 +799,8 @@ public emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStar java.lang.String[] descriptorData = { "\n\036PlatformStartRouteNotify.proto\032\022Platfo" + "rmInfo.proto\"b\n\030PlatformStartRouteNotify" + - "\022\021\n\tentity_id\030\016 \001(\r\022\022\n\nscene_time\030\004 \001(\r\022" + - "\037\n\010platform\030\n \001(\0132\r.PlatformInfoB\033\n\031emu." + + "\022\022\n\nscene_time\030\003 \001(\r\022\021\n\tentity_id\030\006 \001(\r\022" + + "\037\n\010platform\030\013 \001(\0132\r.PlatformInfoB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -815,7 +813,7 @@ public emu.grasscutter.net.proto.PlatformStartRouteNotifyOuterClass.PlatformStar internal_static_PlatformStartRouteNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlatformStartRouteNotify_descriptor, - new java.lang.String[] { "EntityId", "SceneTime", "Platform", }); + new java.lang.String[] { "SceneTime", "EntityId", "Platform", }); emu.grasscutter.net.proto.PlatformInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeNotifyOuterClass.java index 87def957ceb..4af7c94139a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeNotifyOuterClass.java @@ -19,30 +19,29 @@ public interface PlayerApplyEnterHomeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .OnlinePlayerInfo src_player_info = 2; + * uint32 src_app_id = 1; + * @return The srcAppId. + */ + int getSrcAppId(); + + /** + * .OnlinePlayerInfo src_player_info = 12; * @return Whether the srcPlayerInfo field is set. */ boolean hasSrcPlayerInfo(); /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; * @return The srcPlayerInfo. */ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo(); /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder(); - - /** - * uint32 src_app_id = 12; - * @return The srcAppId. - */ - int getSrcAppId(); } /** * 
-   * CmdId: 26047
-   * Obf: HKFIJOMFLOA
+   * CmdId: 8132
    *
* * Protobuf type {@code PlayerApplyEnterHomeNotify} @@ -89,7 +88,12 @@ private PlayerApplyEnterHomeNotify( case 0: done = true; break; - case 18: { + case 8: { + + srcAppId_ = input.readUInt32(); + break; + } + case 98: { emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null; if (srcPlayerInfo_ != null) { subBuilder = srcPlayerInfo_.toBuilder(); @@ -102,11 +106,6 @@ private PlayerApplyEnterHomeNotify( break; } - case 96: { - - srcAppId_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -139,10 +138,21 @@ private PlayerApplyEnterHomeNotify( emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify.class, emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify.Builder.class); } - public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 2; + public static final int SRC_APP_ID_FIELD_NUMBER = 1; + private int srcAppId_; + /** + * uint32 src_app_id = 1; + * @return The srcAppId. + */ + @java.lang.Override + public int getSrcAppId() { + return srcAppId_; + } + + public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 12; private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_; /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; * @return Whether the srcPlayerInfo field is set. */ @java.lang.Override @@ -150,7 +160,7 @@ public boolean hasSrcPlayerInfo() { return srcPlayerInfo_ != null; } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; * @return The srcPlayerInfo. */ @java.lang.Override @@ -158,24 +168,13 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get return srcPlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : srcPlayerInfo_; } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ @java.lang.Override public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() { return getSrcPlayerInfo(); } - public static final int SRC_APP_ID_FIELD_NUMBER = 12; - private int srcAppId_; - /** - * uint32 src_app_id = 12; - * @return The srcAppId. - */ - @java.lang.Override - public int getSrcAppId() { - return srcAppId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -190,11 +189,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (srcPlayerInfo_ != null) { - output.writeMessage(2, getSrcPlayerInfo()); - } if (srcAppId_ != 0) { - output.writeUInt32(12, srcAppId_); + output.writeUInt32(1, srcAppId_); + } + if (srcPlayerInfo_ != null) { + output.writeMessage(12, getSrcPlayerInfo()); } unknownFields.writeTo(output); } @@ -205,13 +204,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (srcPlayerInfo_ != null) { + if (srcAppId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getSrcPlayerInfo()); + .computeUInt32Size(1, srcAppId_); } - if (srcAppId_ != 0) { + if (srcPlayerInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, srcAppId_); + .computeMessageSize(12, getSrcPlayerInfo()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -228,13 +227,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify other = (emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify) obj; + if (getSrcAppId() + != other.getSrcAppId()) return false; if (hasSrcPlayerInfo() != other.hasSrcPlayerInfo()) return false; if (hasSrcPlayerInfo()) { if (!getSrcPlayerInfo() .equals(other.getSrcPlayerInfo())) return false; } - if (getSrcAppId() - != other.getSrcAppId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -246,12 +245,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + SRC_APP_ID_FIELD_NUMBER; + hash = (53 * hash) + getSrcAppId(); if (hasSrcPlayerInfo()) { hash = (37 * hash) + SRC_PLAYER_INFO_FIELD_NUMBER; hash = (53 * hash) + getSrcPlayerInfo().hashCode(); } - hash = (37 * hash) + SRC_APP_ID_FIELD_NUMBER; - hash = (53 * hash) + getSrcAppId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -349,8 +348,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 26047
-     * Obf: HKFIJOMFLOA
+     * CmdId: 8132
      *
* * Protobuf type {@code PlayerApplyEnterHomeNotify} @@ -390,14 +388,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + srcAppId_ = 0; + if (srcPlayerInfoBuilder_ == null) { srcPlayerInfo_ = null; } else { srcPlayerInfo_ = null; srcPlayerInfoBuilder_ = null; } - srcAppId_ = 0; - return this; } @@ -424,12 +422,12 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerAppl @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify buildPartial() { emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify result = new emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify(this); + result.srcAppId_ = srcAppId_; if (srcPlayerInfoBuilder_ == null) { result.srcPlayerInfo_ = srcPlayerInfo_; } else { result.srcPlayerInfo_ = srcPlayerInfoBuilder_.build(); } - result.srcAppId_ = srcAppId_; onBuilt(); return result; } @@ -478,12 +476,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify other) { if (other == emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerApplyEnterHomeNotify.getDefaultInstance()) return this; - if (other.hasSrcPlayerInfo()) { - mergeSrcPlayerInfo(other.getSrcPlayerInfo()); - } if (other.getSrcAppId() != 0) { setSrcAppId(other.getSrcAppId()); } + if (other.hasSrcPlayerInfo()) { + mergeSrcPlayerInfo(other.getSrcPlayerInfo()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -513,18 +511,49 @@ public Builder mergeFrom( return this; } + private int srcAppId_ ; + /** + * uint32 src_app_id = 1; + * @return The srcAppId. + */ + @java.lang.Override + public int getSrcAppId() { + return srcAppId_; + } + /** + * uint32 src_app_id = 1; + * @param value The srcAppId to set. + * @return This builder for chaining. + */ + public Builder setSrcAppId(int value) { + + srcAppId_ = value; + onChanged(); + return this; + } + /** + * uint32 src_app_id = 1; + * @return This builder for chaining. + */ + public Builder clearSrcAppId() { + + srcAppId_ = 0; + onChanged(); + return this; + } + private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> srcPlayerInfoBuilder_; /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; * @return Whether the srcPlayerInfo field is set. */ public boolean hasSrcPlayerInfo() { return srcPlayerInfoBuilder_ != null || srcPlayerInfo_ != null; } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; * @return The srcPlayerInfo. */ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo() { @@ -535,7 +564,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo get } } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ public Builder setSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) { if (srcPlayerInfoBuilder_ == null) { @@ -551,7 +580,7 @@ public Builder setSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterC return this; } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ public Builder setSrcPlayerInfo( emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) { @@ -565,7 +594,7 @@ public Builder setSrcPlayerInfo( return this; } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ public Builder mergeSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) { if (srcPlayerInfoBuilder_ == null) { @@ -583,7 +612,7 @@ public Builder mergeSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOute return this; } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ public Builder clearSrcPlayerInfo() { if (srcPlayerInfoBuilder_ == null) { @@ -597,7 +626,7 @@ public Builder clearSrcPlayerInfo() { return this; } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getSrcPlayerInfoBuilder() { @@ -605,7 +634,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Bui return getSrcPlayerInfoFieldBuilder().getBuilder(); } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() { if (srcPlayerInfoBuilder_ != null) { @@ -616,7 +645,7 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBu } } /** - * .OnlinePlayerInfo src_player_info = 2; + * .OnlinePlayerInfo src_player_info = 12; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> @@ -631,37 +660,6 @@ public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBu } return srcPlayerInfoBuilder_; } - - private int srcAppId_ ; - /** - * uint32 src_app_id = 12; - * @return The srcAppId. - */ - @java.lang.Override - public int getSrcAppId() { - return srcAppId_; - } - /** - * uint32 src_app_id = 12; - * @param value The srcAppId to set. - * @return This builder for chaining. - */ - public Builder setSrcAppId(int value) { - - srcAppId_ = value; - onChanged(); - return this; - } - /** - * uint32 src_app_id = 12; - * @return This builder for chaining. - */ - public Builder clearSrcAppId() { - - srcAppId_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -731,8 +729,8 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerAppl java.lang.String[] descriptorData = { "\n PlayerApplyEnterHomeNotify.proto\032\026Onli" + "nePlayerInfo.proto\"\\\n\032PlayerApplyEnterHo" + - "meNotify\022*\n\017src_player_info\030\002 \001(\0132\021.Onli" + - "nePlayerInfo\022\022\n\nsrc_app_id\030\014 \001(\rB\033\n\031emu." + + "meNotify\022\022\n\nsrc_app_id\030\001 \001(\r\022*\n\017src_play" + + "er_info\030\014 \001(\0132\021.OnlinePlayerInfoB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -745,7 +743,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeNotifyOuterClass.PlayerAppl internal_static_PlayerApplyEnterHomeNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerApplyEnterHomeNotify_descriptor, - new java.lang.String[] { "SrcPlayerInfo", "SrcAppId", }); + new java.lang.String[] { "SrcAppId", "SrcPlayerInfo", }); emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultNotifyOuterClass.java index 39710bbaee6..e4c0c9f1857 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultNotifyOuterClass.java @@ -19,44 +19,44 @@ public interface PlayerApplyEnterHomeResultNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_agreed = 1; - * @return The isAgreed. + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; + * @return The enum numeric value on the wire for reason. */ - boolean getIsAgreed(); + int getReasonValue(); + /** + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; + * @return The reason. + */ + emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason getReason(); + + /** + * uint32 target_uid = 3; + * @return The targetUid. + */ + int getTargetUid(); /** - * string target_nickname = 7; + * string target_nickname = 4; * @return The targetNickname. */ java.lang.String getTargetNickname(); /** - * string target_nickname = 7; + * string target_nickname = 4; * @return The bytes for targetNickname. */ com.google.protobuf.ByteString getTargetNicknameBytes(); /** - * uint32 target_uid = 11; - * @return The targetUid. - */ - int getTargetUid(); - - /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; - * @return The enum numeric value on the wire for reason. - */ - int getReasonValue(); - /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; - * @return The reason. + * bool is_agreed = 6; + * @return The isAgreed. */ - emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason getReason(); + boolean getIsAgreed(); } /** * 
-   * CmdId: 26518
-   * Obf: BDMPJIIHGNK
+   * CmdId: 22086
+   * obf: MAHGOPMDKPB
    *
* * Protobuf type {@code PlayerApplyEnterHomeResultNotify} @@ -71,8 +71,8 @@ private PlayerApplyEnterHomeResultNotify(com.google.protobuf.GeneratedMessageV3. super(builder); } private PlayerApplyEnterHomeResultNotify() { - targetNickname_ = ""; reason_ = 0; + targetNickname_ = ""; } @java.lang.Override @@ -105,26 +105,26 @@ private PlayerApplyEnterHomeResultNotify( case 0: done = true; break; - case 8: { + case 16: { + int rawValue = input.readEnum(); - isAgreed_ = input.readBool(); + reason_ = rawValue; break; } - case 32: { - int rawValue = input.readEnum(); + case 24: { - reason_ = rawValue; + targetUid_ = input.readUInt32(); break; } - case 58: { + case 34: { java.lang.String s = input.readStringRequireUtf8(); targetNickname_ = s; break; } - case 88: { + case 48: { - targetUid_ = input.readUInt32(); + isAgreed_ = input.readBool(); break; } default: { @@ -161,7 +161,7 @@ private PlayerApplyEnterHomeResultNotify( /** * 
-     * Obf: HCLKFKDJEMO
+     * obf: MCLKLLLBAIF
      *
* * Protobuf enum {@code PlayerApplyEnterHomeResultNotify.Reason} @@ -204,6 +204,10 @@ public enum Reason * PRIOR_CHECK = 8; */ PRIOR_CHECK(8), + /** + * PLAYER_OFFLINE = 9; + */ + PLAYER_OFFLINE(9), UNRECOGNIZED(-1), ; @@ -243,6 +247,10 @@ public enum Reason * PRIOR_CHECK = 8; */ public static final int PRIOR_CHECK_VALUE = 8; + /** + * PLAYER_OFFLINE = 9; + */ + public static final int PLAYER_OFFLINE_VALUE = 9; public final int getNumber() { @@ -278,6 +286,7 @@ public static Reason forNumber(int value) { case 6: return OPEN_STATE_NOT_OPEN; case 7: return HOST_IN_EDIT_MODE; case 8: return PRIOR_CHECK; + case 9: return PLAYER_OFFLINE; default: return null; } } @@ -334,21 +343,40 @@ private Reason(int value) { // @@protoc_insertion_point(enum_scope:PlayerApplyEnterHomeResultNotify.Reason) } - public static final int IS_AGREED_FIELD_NUMBER = 1; - private boolean isAgreed_; + public static final int REASON_FIELD_NUMBER = 2; + private int reason_; /** - * bool is_agreed = 1; - * @return The isAgreed. + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; + * @return The enum numeric value on the wire for reason. + */ + @java.lang.Override public int getReasonValue() { + return reason_; + } + /** + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; + * @return The reason. + */ + @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason getReason() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.valueOf(reason_); + return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.UNRECOGNIZED : result; + } + + public static final int TARGET_UID_FIELD_NUMBER = 3; + private int targetUid_; + /** + * uint32 target_uid = 3; + * @return The targetUid. */ @java.lang.Override - public boolean getIsAgreed() { - return isAgreed_; + public int getTargetUid() { + return targetUid_; } - public static final int TARGET_NICKNAME_FIELD_NUMBER = 7; + public static final int TARGET_NICKNAME_FIELD_NUMBER = 4; private volatile java.lang.Object targetNickname_; /** - * string target_nickname = 7; + * string target_nickname = 4; * @return The targetNickname. */ @java.lang.Override @@ -365,7 +393,7 @@ public java.lang.String getTargetNickname() { } } /** - * string target_nickname = 7; + * string target_nickname = 4; * @return The bytes for targetNickname. */ @java.lang.Override @@ -383,34 +411,15 @@ public java.lang.String getTargetNickname() { } } - public static final int TARGET_UID_FIELD_NUMBER = 11; - private int targetUid_; + public static final int IS_AGREED_FIELD_NUMBER = 6; + private boolean isAgreed_; /** - * uint32 target_uid = 11; - * @return The targetUid. + * bool is_agreed = 6; + * @return The isAgreed. */ @java.lang.Override - public int getTargetUid() { - return targetUid_; - } - - public static final int REASON_FIELD_NUMBER = 4; - private int reason_; - /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; - * @return The enum numeric value on the wire for reason. - */ - @java.lang.Override public int getReasonValue() { - return reason_; - } - /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; - * @return The reason. - */ - @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason getReason() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.valueOf(reason_); - return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.UNRECOGNIZED : result; + public boolean getIsAgreed() { + return isAgreed_; } private byte memoizedIsInitialized = -1; @@ -427,17 +436,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (isAgreed_ != false) { - output.writeBool(1, isAgreed_); - } if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.PLAYER_JUDGE.getNumber()) { - output.writeEnum(4, reason_); + output.writeEnum(2, reason_); + } + if (targetUid_ != 0) { + output.writeUInt32(3, targetUid_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetNickname_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, targetNickname_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, targetNickname_); } - if (targetUid_ != 0) { - output.writeUInt32(11, targetUid_); + if (isAgreed_ != false) { + output.writeBool(6, isAgreed_); } unknownFields.writeTo(output); } @@ -448,20 +457,20 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (isAgreed_ != false) { + if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.PLAYER_JUDGE.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, isAgreed_); + .computeEnumSize(2, reason_); } - if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.PLAYER_JUDGE.getNumber()) { + if (targetUid_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(4, reason_); + .computeUInt32Size(3, targetUid_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetNickname_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, targetNickname_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, targetNickname_); } - if (targetUid_ != 0) { + if (isAgreed_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, targetUid_); + .computeBoolSize(6, isAgreed_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -478,13 +487,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify other = (emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify) obj; - if (getIsAgreed() - != other.getIsAgreed()) return false; - if (!getTargetNickname() - .equals(other.getTargetNickname())) return false; + if (reason_ != other.reason_) return false; if (getTargetUid() != other.getTargetUid()) return false; - if (reason_ != other.reason_) return false; + if (!getTargetNickname() + .equals(other.getTargetNickname())) return false; + if (getIsAgreed() + != other.getIsAgreed()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -496,15 +505,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + REASON_FIELD_NUMBER; + hash = (53 * hash) + reason_; + hash = (37 * hash) + TARGET_UID_FIELD_NUMBER; + hash = (53 * hash) + getTargetUid(); + hash = (37 * hash) + TARGET_NICKNAME_FIELD_NUMBER; + hash = (53 * hash) + getTargetNickname().hashCode(); hash = (37 * hash) + IS_AGREED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsAgreed()); - hash = (37 * hash) + TARGET_NICKNAME_FIELD_NUMBER; - hash = (53 * hash) + getTargetNickname().hashCode(); - hash = (37 * hash) + TARGET_UID_FIELD_NUMBER; - hash = (53 * hash) + getTargetUid(); - hash = (37 * hash) + REASON_FIELD_NUMBER; - hash = (53 * hash) + reason_; hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -602,8 +611,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 26518
-     * Obf: BDMPJIIHGNK
+     * CmdId: 22086
+     * obf: MAHGOPMDKPB
      *
* * Protobuf type {@code PlayerApplyEnterHomeResultNotify} @@ -643,13 +652,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isAgreed_ = false; - - targetNickname_ = ""; + reason_ = 0; targetUid_ = 0; - reason_ = 0; + targetNickname_ = ""; + + isAgreed_ = false; return this; } @@ -677,10 +686,10 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.Play @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify buildPartial() { emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify result = new emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify(this); - result.isAgreed_ = isAgreed_; - result.targetNickname_ = targetNickname_; - result.targetUid_ = targetUid_; result.reason_ = reason_; + result.targetUid_ = targetUid_; + result.targetNickname_ = targetNickname_; + result.isAgreed_ = isAgreed_; onBuilt(); return result; } @@ -729,18 +738,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify other) { if (other == emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.getDefaultInstance()) return this; - if (other.getIsAgreed() != false) { - setIsAgreed(other.getIsAgreed()); + if (other.reason_ != 0) { + setReasonValue(other.getReasonValue()); + } + if (other.getTargetUid() != 0) { + setTargetUid(other.getTargetUid()); } if (!other.getTargetNickname().isEmpty()) { targetNickname_ = other.targetNickname_; onChanged(); } - if (other.getTargetUid() != 0) { - setTargetUid(other.getTargetUid()); - } - if (other.reason_ != 0) { - setReasonValue(other.getReasonValue()); + if (other.getIsAgreed() != false) { + setIsAgreed(other.getIsAgreed()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -771,40 +780,94 @@ public Builder mergeFrom( return this; } - private boolean isAgreed_ ; + private int reason_ = 0; /** - * bool is_agreed = 1; - * @return The isAgreed. + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; + * @return The enum numeric value on the wire for reason. + */ + @java.lang.Override public int getReasonValue() { + return reason_; + } + /** + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; + * @param value The enum numeric value on the wire for reason to set. + * @return This builder for chaining. + */ + public Builder setReasonValue(int value) { + + reason_ = value; + onChanged(); + return this; + } + /** + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; + * @return The reason. */ @java.lang.Override - public boolean getIsAgreed() { - return isAgreed_; + public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason getReason() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.valueOf(reason_); + return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.UNRECOGNIZED : result; } /** - * bool is_agreed = 1; - * @param value The isAgreed to set. + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; + * @param value The reason to set. * @return This builder for chaining. */ - public Builder setIsAgreed(boolean value) { + public Builder setReason(emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason value) { + if (value == null) { + throw new NullPointerException(); + } - isAgreed_ = value; + reason_ = value.getNumber(); onChanged(); return this; } /** - * bool is_agreed = 1; + * .PlayerApplyEnterHomeResultNotify.Reason reason = 2; * @return This builder for chaining. */ - public Builder clearIsAgreed() { + public Builder clearReason() { - isAgreed_ = false; + reason_ = 0; + onChanged(); + return this; + } + + private int targetUid_ ; + /** + * uint32 target_uid = 3; + * @return The targetUid. + */ + @java.lang.Override + public int getTargetUid() { + return targetUid_; + } + /** + * uint32 target_uid = 3; + * @param value The targetUid to set. + * @return This builder for chaining. + */ + public Builder setTargetUid(int value) { + + targetUid_ = value; + onChanged(); + return this; + } + /** + * uint32 target_uid = 3; + * @return This builder for chaining. + */ + public Builder clearTargetUid() { + + targetUid_ = 0; onChanged(); return this; } private java.lang.Object targetNickname_ = ""; /** - * string target_nickname = 7; + * string target_nickname = 4; * @return The targetNickname. */ public java.lang.String getTargetNickname() { @@ -820,7 +883,7 @@ public java.lang.String getTargetNickname() { } } /** - * string target_nickname = 7; + * string target_nickname = 4; * @return The bytes for targetNickname. */ public com.google.protobuf.ByteString @@ -837,7 +900,7 @@ public java.lang.String getTargetNickname() { } } /** - * string target_nickname = 7; + * string target_nickname = 4; * @param value The targetNickname to set. * @return This builder for chaining. */ @@ -852,7 +915,7 @@ public Builder setTargetNickname( return this; } /** - * string target_nickname = 7; + * string target_nickname = 4; * @return This builder for chaining. */ public Builder clearTargetNickname() { @@ -862,7 +925,7 @@ public Builder clearTargetNickname() { return this; } /** - * string target_nickname = 7; + * string target_nickname = 4; * @param value The bytes for targetNickname to set. * @return This builder for chaining. */ @@ -878,87 +941,33 @@ public Builder setTargetNicknameBytes( return this; } - private int targetUid_ ; - /** - * uint32 target_uid = 11; - * @return The targetUid. - */ - @java.lang.Override - public int getTargetUid() { - return targetUid_; - } - /** - * uint32 target_uid = 11; - * @param value The targetUid to set. - * @return This builder for chaining. - */ - public Builder setTargetUid(int value) { - - targetUid_ = value; - onChanged(); - return this; - } - /** - * uint32 target_uid = 11; - * @return This builder for chaining. - */ - public Builder clearTargetUid() { - - targetUid_ = 0; - onChanged(); - return this; - } - - private int reason_ = 0; - /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; - * @return The enum numeric value on the wire for reason. - */ - @java.lang.Override public int getReasonValue() { - return reason_; - } - /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; - * @param value The enum numeric value on the wire for reason to set. - * @return This builder for chaining. - */ - public Builder setReasonValue(int value) { - - reason_ = value; - onChanged(); - return this; - } + private boolean isAgreed_ ; /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; - * @return The reason. + * bool is_agreed = 6; + * @return The isAgreed. */ @java.lang.Override - public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason getReason() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.valueOf(reason_); - return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason.UNRECOGNIZED : result; + public boolean getIsAgreed() { + return isAgreed_; } /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; - * @param value The reason to set. + * bool is_agreed = 6; + * @param value The isAgreed to set. * @return This builder for chaining. */ - public Builder setReason(emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.PlayerApplyEnterHomeResultNotify.Reason value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setIsAgreed(boolean value) { - reason_ = value.getNumber(); + isAgreed_ = value; onChanged(); return this; } /** - * .PlayerApplyEnterHomeResultNotify.Reason reason = 4; + * bool is_agreed = 6; * @return This builder for chaining. */ - public Builder clearReason() { + public Builder clearIsAgreed() { - reason_ = 0; + isAgreed_ = false; onChanged(); return this; } @@ -1030,17 +1039,18 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.Play static { java.lang.String[] descriptorData = { "\n&PlayerApplyEnterHomeResultNotify.proto" + - "\"\200\003\n PlayerApplyEnterHomeResultNotify\022\021\n" + - "\tis_agreed\030\001 \001(\010\022\027\n\017target_nickname\030\007 \001(" + - "\t\022\022\n\ntarget_uid\030\013 \001(\r\0228\n\006reason\030\004 \001(\0162(." + - "PlayerApplyEnterHomeResultNotify.Reason\"" + - "\341\001\n\006Reason\022\020\n\014PLAYER_JUDGE\020\000\022\036\n\032PLAYER_E" + + "\"\224\003\n PlayerApplyEnterHomeResultNotify\0228\n" + + "\006reason\030\002 \001(\0162(.PlayerApplyEnterHomeResu" + + "ltNotify.Reason\022\022\n\ntarget_uid\030\003 \001(\r\022\027\n\017t" + + "arget_nickname\030\004 \001(\t\022\021\n\tis_agreed\030\006 \001(\010\"" + + "\365\001\n\006Reason\022\020\n\014PLAYER_JUDGE\020\000\022\036\n\032PLAYER_E" + "NTER_OPTION_REFUSE\020\001\022\036\n\032PLAYER_ENTER_OPT" + "ION_DIRECT\020\002\022\020\n\014SYSTEM_JUDGE\020\003\022\021\n\rHOST_I" + "N_MATCH\020\004\022\037\n\033PS_PLAYER_NOT_ACCEPT_OTHERS" + "\020\005\022\027\n\023OPEN_STATE_NOT_OPEN\020\006\022\025\n\021HOST_IN_E" + - "DIT_MODE\020\007\022\017\n\013PRIOR_CHECK\020\010B\033\n\031emu.grass" + - "cutter.net.protob\006proto3" + "DIT_MODE\020\007\022\017\n\013PRIOR_CHECK\020\010\022\022\n\016PLAYER_OF" + + "FLINE\020\tB\033\n\031emu.grasscutter.net.protob\006pr" + + "oto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1051,7 +1061,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultNotifyOuterClass.Play internal_static_PlayerApplyEnterHomeResultNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerApplyEnterHomeResultNotify_descriptor, - new java.lang.String[] { "IsAgreed", "TargetNickname", "TargetUid", "Reason", }); + new java.lang.String[] { "Reason", "TargetUid", "TargetNickname", "IsAgreed", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultReqOuterClass.java index 877f880cb34..1024563571f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultReqOuterClass.java @@ -19,21 +19,20 @@ public interface PlayerApplyEnterHomeResultReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_agreed = 13; + * bool is_agreed = 2; * @return The isAgreed. */ boolean getIsAgreed(); /** - * uint32 apply_uid = 1; + * uint32 apply_uid = 6; * @return The applyUid. */ int getApplyUid(); } /** * 
-   * CmdId: 20101
-   * Obf: CMPHGAMCBGN
+   * CmdId: 378
    *
* * Protobuf type {@code PlayerApplyEnterHomeResultReq} @@ -80,14 +79,14 @@ private PlayerApplyEnterHomeResultReq( case 0: done = true; break; - case 8: { + case 16: { - applyUid_ = input.readUInt32(); + isAgreed_ = input.readBool(); break; } - case 104: { + case 48: { - isAgreed_ = input.readBool(); + applyUid_ = input.readUInt32(); break; } default: { @@ -122,10 +121,10 @@ private PlayerApplyEnterHomeResultReq( emu.grasscutter.net.proto.PlayerApplyEnterHomeResultReqOuterClass.PlayerApplyEnterHomeResultReq.class, emu.grasscutter.net.proto.PlayerApplyEnterHomeResultReqOuterClass.PlayerApplyEnterHomeResultReq.Builder.class); } - public static final int IS_AGREED_FIELD_NUMBER = 13; + public static final int IS_AGREED_FIELD_NUMBER = 2; private boolean isAgreed_; /** - * bool is_agreed = 13; + * bool is_agreed = 2; * @return The isAgreed. */ @java.lang.Override @@ -133,10 +132,10 @@ public boolean getIsAgreed() { return isAgreed_; } - public static final int APPLY_UID_FIELD_NUMBER = 1; + public static final int APPLY_UID_FIELD_NUMBER = 6; private int applyUid_; /** - * uint32 apply_uid = 1; + * uint32 apply_uid = 6; * @return The applyUid. */ @java.lang.Override @@ -158,11 +157,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (applyUid_ != 0) { - output.writeUInt32(1, applyUid_); - } if (isAgreed_ != false) { - output.writeBool(13, isAgreed_); + output.writeBool(2, isAgreed_); + } + if (applyUid_ != 0) { + output.writeUInt32(6, applyUid_); } unknownFields.writeTo(output); } @@ -173,13 +172,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (applyUid_ != 0) { + if (isAgreed_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, applyUid_); + .computeBoolSize(2, isAgreed_); } - if (isAgreed_ != false) { + if (applyUid_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(13, isAgreed_); + .computeUInt32Size(6, applyUid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -313,8 +312,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20101
-     * Obf: CMPHGAMCBGN
+     * CmdId: 378
      *
* * Protobuf type {@code PlayerApplyEnterHomeResultReq} @@ -471,7 +469,7 @@ public Builder mergeFrom( private boolean isAgreed_ ; /** - * bool is_agreed = 13; + * bool is_agreed = 2; * @return The isAgreed. */ @java.lang.Override @@ -479,7 +477,7 @@ public boolean getIsAgreed() { return isAgreed_; } /** - * bool is_agreed = 13; + * bool is_agreed = 2; * @param value The isAgreed to set. * @return This builder for chaining. */ @@ -490,7 +488,7 @@ public Builder setIsAgreed(boolean value) { return this; } /** - * bool is_agreed = 13; + * bool is_agreed = 2; * @return This builder for chaining. */ public Builder clearIsAgreed() { @@ -502,7 +500,7 @@ public Builder clearIsAgreed() { private int applyUid_ ; /** - * uint32 apply_uid = 1; + * uint32 apply_uid = 6; * @return The applyUid. */ @java.lang.Override @@ -510,7 +508,7 @@ public int getApplyUid() { return applyUid_; } /** - * uint32 apply_uid = 1; + * uint32 apply_uid = 6; * @param value The applyUid to set. * @return This builder for chaining. */ @@ -521,7 +519,7 @@ public Builder setApplyUid(int value) { return this; } /** - * uint32 apply_uid = 1; + * uint32 apply_uid = 6; * @return This builder for chaining. */ public Builder clearApplyUid() { @@ -599,7 +597,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultReqOuterClass.PlayerA java.lang.String[] descriptorData = { "\n#PlayerApplyEnterHomeResultReq.proto\"E\n" + "\035PlayerApplyEnterHomeResultReq\022\021\n\tis_agr" + - "eed\030\r \001(\010\022\021\n\tapply_uid\030\001 \001(\rB\033\n\031emu.gras" + + "eed\030\002 \001(\010\022\021\n\tapply_uid\030\006 \001(\rB\033\n\031emu.gras" + "scutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultRspOuterClass.java index 2900bafff4f..b0e90249fd1 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterHomeResultRspOuterClass.java @@ -19,33 +19,33 @@ public interface PlayerApplyEnterHomeResultRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_agreed = 3; - * @return The isAgreed. + * uint32 apply_uid = 1; + * @return The applyUid. */ - boolean getIsAgreed(); + int getApplyUid(); /** - * int32 retcode = 6; - * @return The retcode. + * uint32 param = 5; + * @return The param. */ - int getRetcode(); + int getParam(); /** - * uint32 param = 8; - * @return The param. + * int32 retcode = 6; + * @return The retcode. */ - int getParam(); + int getRetcode(); /** - * uint32 apply_uid = 1; - * @return The applyUid. + * bool is_agreed = 11; + * @return The isAgreed. */ - int getApplyUid(); + boolean getIsAgreed(); } /** * 
-   * CmdId: 5358
-   * Obf: MCGEJCOHFFM
+   * CmdId: 21189
+   * obf: EJLOLDHLMHP
    *
* * Protobuf type {@code PlayerApplyEnterHomeResultRsp} @@ -97,9 +97,9 @@ private PlayerApplyEnterHomeResultRsp( applyUid_ = input.readUInt32(); break; } - case 24: { + case 40: { - isAgreed_ = input.readBool(); + param_ = input.readUInt32(); break; } case 48: { @@ -107,9 +107,9 @@ private PlayerApplyEnterHomeResultRsp( retcode_ = input.readInt32(); break; } - case 64: { + case 88: { - param_ = input.readUInt32(); + isAgreed_ = input.readBool(); break; } default: { @@ -144,15 +144,26 @@ private PlayerApplyEnterHomeResultRsp( emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp.class, emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp.Builder.class); } - public static final int IS_AGREED_FIELD_NUMBER = 3; - private boolean isAgreed_; + public static final int APPLY_UID_FIELD_NUMBER = 1; + private int applyUid_; /** - * bool is_agreed = 3; - * @return The isAgreed. + * uint32 apply_uid = 1; + * @return The applyUid. */ @java.lang.Override - public boolean getIsAgreed() { - return isAgreed_; + public int getApplyUid() { + return applyUid_; + } + + public static final int PARAM_FIELD_NUMBER = 5; + private int param_; + /** + * uint32 param = 5; + * @return The param. + */ + @java.lang.Override + public int getParam() { + return param_; } public static final int RETCODE_FIELD_NUMBER = 6; @@ -166,26 +177,15 @@ public int getRetcode() { return retcode_; } - public static final int PARAM_FIELD_NUMBER = 8; - private int param_; - /** - * uint32 param = 8; - * @return The param. - */ - @java.lang.Override - public int getParam() { - return param_; - } - - public static final int APPLY_UID_FIELD_NUMBER = 1; - private int applyUid_; + public static final int IS_AGREED_FIELD_NUMBER = 11; + private boolean isAgreed_; /** - * uint32 apply_uid = 1; - * @return The applyUid. + * bool is_agreed = 11; + * @return The isAgreed. */ @java.lang.Override - public int getApplyUid() { - return applyUid_; + public boolean getIsAgreed() { + return isAgreed_; } private byte memoizedIsInitialized = -1; @@ -205,14 +205,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (applyUid_ != 0) { output.writeUInt32(1, applyUid_); } - if (isAgreed_ != false) { - output.writeBool(3, isAgreed_); + if (param_ != 0) { + output.writeUInt32(5, param_); } if (retcode_ != 0) { output.writeInt32(6, retcode_); } - if (param_ != 0) { - output.writeUInt32(8, param_); + if (isAgreed_ != false) { + output.writeBool(11, isAgreed_); } unknownFields.writeTo(output); } @@ -227,17 +227,17 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(1, applyUid_); } - if (isAgreed_ != false) { + if (param_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, isAgreed_); + .computeUInt32Size(5, param_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(6, retcode_); } - if (param_ != 0) { + if (isAgreed_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, param_); + .computeBoolSize(11, isAgreed_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -254,14 +254,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp other = (emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp) obj; - if (getIsAgreed() - != other.getIsAgreed()) return false; - if (getRetcode() - != other.getRetcode()) return false; - if (getParam() - != other.getParam()) return false; if (getApplyUid() != other.getApplyUid()) return false; + if (getParam() + != other.getParam()) return false; + if (getRetcode() + != other.getRetcode()) return false; + if (getIsAgreed() + != other.getIsAgreed()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -273,15 +273,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + APPLY_UID_FIELD_NUMBER; + hash = (53 * hash) + getApplyUid(); + hash = (37 * hash) + PARAM_FIELD_NUMBER; + hash = (53 * hash) + getParam(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (37 * hash) + IS_AGREED_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsAgreed()); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + PARAM_FIELD_NUMBER; - hash = (53 * hash) + getParam(); - hash = (37 * hash) + APPLY_UID_FIELD_NUMBER; - hash = (53 * hash) + getApplyUid(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -379,8 +379,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5358
-     * Obf: MCGEJCOHFFM
+     * CmdId: 21189
+     * obf: EJLOLDHLMHP
      *
* * Protobuf type {@code PlayerApplyEnterHomeResultRsp} @@ -420,13 +420,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isAgreed_ = false; - - retcode_ = 0; + applyUid_ = 0; param_ = 0; - applyUid_ = 0; + retcode_ = 0; + + isAgreed_ = false; return this; } @@ -454,10 +454,10 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerA @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp buildPartial() { emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp result = new emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp(this); - result.isAgreed_ = isAgreed_; - result.retcode_ = retcode_; - result.param_ = param_; result.applyUid_ = applyUid_; + result.param_ = param_; + result.retcode_ = retcode_; + result.isAgreed_ = isAgreed_; onBuilt(); return result; } @@ -506,17 +506,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp other) { if (other == emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerApplyEnterHomeResultRsp.getDefaultInstance()) return this; - if (other.getIsAgreed() != false) { - setIsAgreed(other.getIsAgreed()); - } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); + if (other.getApplyUid() != 0) { + setApplyUid(other.getApplyUid()); } if (other.getParam() != 0) { setParam(other.getParam()); } - if (other.getApplyUid() != 0) { - setApplyUid(other.getApplyUid()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } + if (other.getIsAgreed() != false) { + setIsAgreed(other.getIsAgreed()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -547,126 +547,126 @@ public Builder mergeFrom( return this; } - private boolean isAgreed_ ; + private int applyUid_ ; /** - * bool is_agreed = 3; - * @return The isAgreed. + * uint32 apply_uid = 1; + * @return The applyUid. */ @java.lang.Override - public boolean getIsAgreed() { - return isAgreed_; + public int getApplyUid() { + return applyUid_; } /** - * bool is_agreed = 3; - * @param value The isAgreed to set. + * uint32 apply_uid = 1; + * @param value The applyUid to set. * @return This builder for chaining. */ - public Builder setIsAgreed(boolean value) { + public Builder setApplyUid(int value) { - isAgreed_ = value; + applyUid_ = value; onChanged(); return this; } /** - * bool is_agreed = 3; + * uint32 apply_uid = 1; * @return This builder for chaining. */ - public Builder clearIsAgreed() { + public Builder clearApplyUid() { - isAgreed_ = false; + applyUid_ = 0; onChanged(); return this; } - private int retcode_ ; + private int param_ ; /** - * int32 retcode = 6; - * @return The retcode. + * uint32 param = 5; + * @return The param. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getParam() { + return param_; } /** - * int32 retcode = 6; - * @param value The retcode to set. + * uint32 param = 5; + * @param value The param to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setParam(int value) { - retcode_ = value; + param_ = value; onChanged(); return this; } /** - * int32 retcode = 6; + * uint32 param = 5; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearParam() { - retcode_ = 0; + param_ = 0; onChanged(); return this; } - private int param_ ; + private int retcode_ ; /** - * uint32 param = 8; - * @return The param. + * int32 retcode = 6; + * @return The retcode. */ @java.lang.Override - public int getParam() { - return param_; + public int getRetcode() { + return retcode_; } /** - * uint32 param = 8; - * @param value The param to set. + * int32 retcode = 6; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setParam(int value) { + public Builder setRetcode(int value) { - param_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 param = 8; + * int32 retcode = 6; * @return This builder for chaining. */ - public Builder clearParam() { + public Builder clearRetcode() { - param_ = 0; + retcode_ = 0; onChanged(); return this; } - private int applyUid_ ; + private boolean isAgreed_ ; /** - * uint32 apply_uid = 1; - * @return The applyUid. + * bool is_agreed = 11; + * @return The isAgreed. */ @java.lang.Override - public int getApplyUid() { - return applyUid_; + public boolean getIsAgreed() { + return isAgreed_; } /** - * uint32 apply_uid = 1; - * @param value The applyUid to set. + * bool is_agreed = 11; + * @param value The isAgreed to set. * @return This builder for chaining. */ - public Builder setApplyUid(int value) { + public Builder setIsAgreed(boolean value) { - applyUid_ = value; + isAgreed_ = value; onChanged(); return this; } /** - * uint32 apply_uid = 1; + * bool is_agreed = 11; * @return This builder for chaining. */ - public Builder clearApplyUid() { + public Builder clearIsAgreed() { - applyUid_ = 0; + isAgreed_ = false; onChanged(); return this; } @@ -738,9 +738,9 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerA static { java.lang.String[] descriptorData = { "\n#PlayerApplyEnterHomeResultRsp.proto\"e\n" + - "\035PlayerApplyEnterHomeResultRsp\022\021\n\tis_agr" + - "eed\030\003 \001(\010\022\017\n\007retcode\030\006 \001(\005\022\r\n\005param\030\010 \001(" + - "\r\022\021\n\tapply_uid\030\001 \001(\rB\033\n\031emu.grasscutter." + + "\035PlayerApplyEnterHomeResultRsp\022\021\n\tapply_" + + "uid\030\001 \001(\r\022\r\n\005param\030\005 \001(\r\022\017\n\007retcode\030\006 \001(" + + "\005\022\021\n\tis_agreed\030\013 \001(\010B\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -752,7 +752,7 @@ public emu.grasscutter.net.proto.PlayerApplyEnterHomeResultRspOuterClass.PlayerA internal_static_PlayerApplyEnterHomeResultRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerApplyEnterHomeResultRsp_descriptor, - new java.lang.String[] { "IsAgreed", "Retcode", "Param", "ApplyUid", }); + new java.lang.String[] { "ApplyUid", "Param", "Retcode", "IsAgreed", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCompoundMaterialReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCompoundMaterialReqOuterClass.java index 757e296b23b..5531da0d5f2 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCompoundMaterialReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCompoundMaterialReqOuterClass.java @@ -19,21 +19,21 @@ public interface PlayerCompoundMaterialReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 compound_id = 2; - * @return The compoundId. + * uint32 count = 6; + * @return The count. */ - int getCompoundId(); + int getCount(); /** - * uint32 count = 11; - * @return The count. + * uint32 compound_id = 14; + * @return The compoundId. */ - int getCount(); + int getCompoundId(); } /** * 
-   * CmdId: 7541
-   * Obf: AILEMFGGGHN
+   * CmdId: 530
+   * obf: GBDLCNPNCOC
    *
* * Protobuf type {@code PlayerCompoundMaterialReq} @@ -80,14 +80,14 @@ private PlayerCompoundMaterialReq( case 0: done = true; break; - case 16: { + case 48: { - compoundId_ = input.readUInt32(); + count_ = input.readUInt32(); break; } - case 88: { + case 112: { - count_ = input.readUInt32(); + compoundId_ = input.readUInt32(); break; } default: { @@ -122,26 +122,26 @@ private PlayerCompoundMaterialReq( emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq.class, emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq.Builder.class); } - public static final int COMPOUND_ID_FIELD_NUMBER = 2; - private int compoundId_; + public static final int COUNT_FIELD_NUMBER = 6; + private int count_; /** - * uint32 compound_id = 2; - * @return The compoundId. + * uint32 count = 6; + * @return The count. */ @java.lang.Override - public int getCompoundId() { - return compoundId_; + public int getCount() { + return count_; } - public static final int COUNT_FIELD_NUMBER = 11; - private int count_; + public static final int COMPOUND_ID_FIELD_NUMBER = 14; + private int compoundId_; /** - * uint32 count = 11; - * @return The count. + * uint32 compound_id = 14; + * @return The compoundId. */ @java.lang.Override - public int getCount() { - return count_; + public int getCompoundId() { + return compoundId_; } private byte memoizedIsInitialized = -1; @@ -158,11 +158,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (compoundId_ != 0) { - output.writeUInt32(2, compoundId_); - } if (count_ != 0) { - output.writeUInt32(11, count_); + output.writeUInt32(6, count_); + } + if (compoundId_ != 0) { + output.writeUInt32(14, compoundId_); } unknownFields.writeTo(output); } @@ -173,13 +173,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (compoundId_ != 0) { + if (count_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, compoundId_); + .computeUInt32Size(6, count_); } - if (count_ != 0) { + if (compoundId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, count_); + .computeUInt32Size(14, compoundId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +196,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq other = (emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq) obj; - if (getCompoundId() - != other.getCompoundId()) return false; if (getCount() != other.getCount()) return false; + if (getCompoundId() + != other.getCompoundId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +211,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + COMPOUND_ID_FIELD_NUMBER; - hash = (53 * hash) + getCompoundId(); hash = (37 * hash) + COUNT_FIELD_NUMBER; hash = (53 * hash) + getCount(); + hash = (37 * hash) + COMPOUND_ID_FIELD_NUMBER; + hash = (53 * hash) + getCompoundId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +312,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7541
-     * Obf: AILEMFGGGHN
+     * CmdId: 530
+     * obf: GBDLCNPNCOC
      *
* * Protobuf type {@code PlayerCompoundMaterialReq} @@ -353,10 +353,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - compoundId_ = 0; - count_ = 0; + compoundId_ = 0; + return this; } @@ -383,8 +383,8 @@ public emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompo @java.lang.Override public emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq buildPartial() { emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq result = new emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq(this); - result.compoundId_ = compoundId_; result.count_ = count_; + result.compoundId_ = compoundId_; onBuilt(); return result; } @@ -433,12 +433,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq other) { if (other == emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompoundMaterialReq.getDefaultInstance()) return this; - if (other.getCompoundId() != 0) { - setCompoundId(other.getCompoundId()); - } if (other.getCount() != 0) { setCount(other.getCount()); } + if (other.getCompoundId() != 0) { + setCompoundId(other.getCompoundId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +468,64 @@ public Builder mergeFrom( return this; } - private int compoundId_ ; + private int count_ ; /** - * uint32 compound_id = 2; - * @return The compoundId. + * uint32 count = 6; + * @return The count. */ @java.lang.Override - public int getCompoundId() { - return compoundId_; + public int getCount() { + return count_; } /** - * uint32 compound_id = 2; - * @param value The compoundId to set. + * uint32 count = 6; + * @param value The count to set. * @return This builder for chaining. */ - public Builder setCompoundId(int value) { + public Builder setCount(int value) { - compoundId_ = value; + count_ = value; onChanged(); return this; } /** - * uint32 compound_id = 2; + * uint32 count = 6; * @return This builder for chaining. */ - public Builder clearCompoundId() { + public Builder clearCount() { - compoundId_ = 0; + count_ = 0; onChanged(); return this; } - private int count_ ; + private int compoundId_ ; /** - * uint32 count = 11; - * @return The count. + * uint32 compound_id = 14; + * @return The compoundId. */ @java.lang.Override - public int getCount() { - return count_; + public int getCompoundId() { + return compoundId_; } /** - * uint32 count = 11; - * @param value The count to set. + * uint32 compound_id = 14; + * @param value The compoundId to set. * @return This builder for chaining. */ - public Builder setCount(int value) { + public Builder setCompoundId(int value) { - count_ = value; + compoundId_ = value; onChanged(); return this; } /** - * uint32 count = 11; + * uint32 compound_id = 14; * @return This builder for chaining. */ - public Builder clearCount() { + public Builder clearCompoundId() { - count_ = 0; + compoundId_ = 0; onChanged(); return this; } @@ -597,8 +597,8 @@ public emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompo static { java.lang.String[] descriptorData = { "\n\037PlayerCompoundMaterialReq.proto\"?\n\031Pla" + - "yerCompoundMaterialReq\022\023\n\013compound_id\030\002 " + - "\001(\r\022\r\n\005count\030\013 \001(\rB\033\n\031emu.grasscutter.ne" + + "yerCompoundMaterialReq\022\r\n\005count\030\006 \001(\r\022\023\n" + + "\013compound_id\030\016 \001(\rB\033\n\031emu.grasscutter.ne" + "t.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +610,7 @@ public emu.grasscutter.net.proto.PlayerCompoundMaterialReqOuterClass.PlayerCompo internal_static_PlayerCompoundMaterialReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerCompoundMaterialReq_descriptor, - new java.lang.String[] { "CompoundId", "Count", }); + new java.lang.String[] { "Count", "CompoundId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCompoundMaterialRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCompoundMaterialRspOuterClass.java index 90af52fb5b5..7532b7559dc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCompoundMaterialRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCompoundMaterialRspOuterClass.java @@ -19,30 +19,30 @@ public interface PlayerCompoundMaterialRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 13; + * int32 retcode = 8; * @return The retcode. */ int getRetcode(); /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; * @return Whether the compoundQueueData field is set. */ boolean hasCompoundQueueData(); /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; * @return The compoundQueueData. */ emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData(); /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder(); } /** * 
-   * CmdId: 25784
-   * Obf: LDKLPKGHGJA
+   * CmdId: 22858
+   * obf: GIBIELHMEIO
    *
* * Protobuf type {@code PlayerCompoundMaterialRsp} @@ -89,7 +89,12 @@ private PlayerCompoundMaterialRsp( case 0: done = true; break; - case 18: { + case 64: { + + retcode_ = input.readInt32(); + break; + } + case 106: { emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder subBuilder = null; if (compoundQueueData_ != null) { subBuilder = compoundQueueData_.toBuilder(); @@ -102,11 +107,6 @@ private PlayerCompoundMaterialRsp( break; } - case 104: { - - retcode_ = input.readInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -139,10 +139,10 @@ private PlayerCompoundMaterialRsp( emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.class, emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompoundMaterialRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 13; + public static final int RETCODE_FIELD_NUMBER = 8; private int retcode_; /** - * int32 retcode = 13; + * int32 retcode = 8; * @return The retcode. */ @java.lang.Override @@ -150,10 +150,10 @@ public int getRetcode() { return retcode_; } - public static final int COMPOUNDQUEUEDATA_FIELD_NUMBER = 2; + public static final int COMPOUNDQUEUEDATA_FIELD_NUMBER = 13; private emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData compoundQueueData_; /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; * @return Whether the compoundQueueData field is set. */ @java.lang.Override @@ -161,7 +161,7 @@ public boolean hasCompoundQueueData() { return compoundQueueData_ != null; } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; * @return The compoundQueueData. */ @java.lang.Override @@ -169,7 +169,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData g return compoundQueueData_ == null ? emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.getDefaultInstance() : compoundQueueData_; } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ @java.lang.Override public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder() { @@ -190,11 +190,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (compoundQueueData_ != null) { - output.writeMessage(2, getCompoundQueueData()); - } if (retcode_ != 0) { - output.writeInt32(13, retcode_); + output.writeInt32(8, retcode_); + } + if (compoundQueueData_ != null) { + output.writeMessage(13, getCompoundQueueData()); } unknownFields.writeTo(output); } @@ -205,13 +205,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (compoundQueueData_ != null) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getCompoundQueueData()); + .computeInt32Size(8, retcode_); } - if (retcode_ != 0) { + if (compoundQueueData_ != null) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(13, retcode_); + .computeMessageSize(13, getCompoundQueueData()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -349,8 +349,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25784
-     * Obf: LDKLPKGHGJA
+     * CmdId: 22858
+     * obf: GIBIELHMEIO
      *
* * Protobuf type {@code PlayerCompoundMaterialRsp} @@ -515,7 +515,7 @@ public Builder mergeFrom( private int retcode_ ; /** - * int32 retcode = 13; + * int32 retcode = 8; * @return The retcode. */ @java.lang.Override @@ -523,7 +523,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 13; + * int32 retcode = 8; * @param value The retcode to set. * @return This builder for chaining. */ @@ -534,7 +534,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 13; + * int32 retcode = 8; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -548,14 +548,14 @@ public Builder clearRetcode() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder> compoundQueueDataBuilder_; /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; * @return Whether the compoundQueueData field is set. */ public boolean hasCompoundQueueData() { return compoundQueueDataBuilder_ != null || compoundQueueData_ != null; } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; * @return The compoundQueueData. */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData getCompoundQueueData() { @@ -566,7 +566,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData g } } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ public Builder setCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) { if (compoundQueueDataBuilder_ == null) { @@ -582,7 +582,7 @@ public Builder setCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataO return this; } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ public Builder setCompoundQueueData( emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder builderForValue) { @@ -596,7 +596,7 @@ public Builder setCompoundQueueData( return this; } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ public Builder mergeCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData value) { if (compoundQueueDataBuilder_ == null) { @@ -614,7 +614,7 @@ public Builder mergeCompoundQueueData(emu.grasscutter.net.proto.CompoundQueueDat return this; } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ public Builder clearCompoundQueueData() { if (compoundQueueDataBuilder_ == null) { @@ -628,7 +628,7 @@ public Builder clearCompoundQueueData() { return this; } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder getCompoundQueueDataBuilder() { @@ -636,7 +636,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.B return getCompoundQueueDataFieldBuilder().getBuilder(); } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder getCompoundQueueDataOrBuilder() { if (compoundQueueDataBuilder_ != null) { @@ -647,7 +647,7 @@ public emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOr } } /** - * .CompoundQueueData compoundQueueData = 2; + * .CompoundQueueData compoundQueueData = 13; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueData.Builder, emu.grasscutter.net.proto.CompoundQueueDataOuterClass.CompoundQueueDataOrBuilder> @@ -731,8 +731,8 @@ public emu.grasscutter.net.proto.PlayerCompoundMaterialRspOuterClass.PlayerCompo java.lang.String[] descriptorData = { "\n\037PlayerCompoundMaterialRsp.proto\032\027Compo" + "undQueueData.proto\"[\n\031PlayerCompoundMate" + - "rialRsp\022\017\n\007retcode\030\r \001(\005\022-\n\021compoundQueu" + - "eData\030\002 \001(\0132\022.CompoundQueueDataB\033\n\031emu.g" + + "rialRsp\022\017\n\007retcode\030\010 \001(\005\022-\n\021compoundQueu" + + "eData\030\r \001(\0132\022.CompoundQueueDataB\033\n\031emu.g" + "rasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookArgsReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookArgsReqOuterClass.java index 8468a95c781..3c93ac71b84 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookArgsReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookArgsReqOuterClass.java @@ -19,21 +19,21 @@ public interface PlayerCookArgsReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 recipe_id = 13; - * @return The recipeId. + * uint32 assist_avatar = 8; + * @return The assistAvatar. */ - int getRecipeId(); + int getAssistAvatar(); /** - * uint32 assist_avatar = 10; - * @return The assistAvatar. + * uint32 recipe_id = 9; + * @return The recipeId. */ - int getAssistAvatar(); + int getRecipeId(); } /** * 
-   * CmdId: 7878
-   * Obf: OKKPNPMEOJN
+   * CmdId: 6593
+   * obf: FHKJJIBPEBH
    *
* * Protobuf type {@code PlayerCookArgsReq} @@ -80,12 +80,12 @@ private PlayerCookArgsReq( case 0: done = true; break; - case 80: { + case 64: { assistAvatar_ = input.readUInt32(); break; } - case 104: { + case 72: { recipeId_ = input.readUInt32(); break; @@ -122,26 +122,26 @@ private PlayerCookArgsReq( emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq.class, emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq.Builder.class); } - public static final int RECIPE_ID_FIELD_NUMBER = 13; - private int recipeId_; + public static final int ASSIST_AVATAR_FIELD_NUMBER = 8; + private int assistAvatar_; /** - * uint32 recipe_id = 13; - * @return The recipeId. + * uint32 assist_avatar = 8; + * @return The assistAvatar. */ @java.lang.Override - public int getRecipeId() { - return recipeId_; + public int getAssistAvatar() { + return assistAvatar_; } - public static final int ASSIST_AVATAR_FIELD_NUMBER = 10; - private int assistAvatar_; + public static final int RECIPE_ID_FIELD_NUMBER = 9; + private int recipeId_; /** - * uint32 assist_avatar = 10; - * @return The assistAvatar. + * uint32 recipe_id = 9; + * @return The recipeId. */ @java.lang.Override - public int getAssistAvatar() { - return assistAvatar_; + public int getRecipeId() { + return recipeId_; } private byte memoizedIsInitialized = -1; @@ -159,10 +159,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (assistAvatar_ != 0) { - output.writeUInt32(10, assistAvatar_); + output.writeUInt32(8, assistAvatar_); } if (recipeId_ != 0) { - output.writeUInt32(13, recipeId_); + output.writeUInt32(9, recipeId_); } unknownFields.writeTo(output); } @@ -175,11 +175,11 @@ public int getSerializedSize() { size = 0; if (assistAvatar_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, assistAvatar_); + .computeUInt32Size(8, assistAvatar_); } if (recipeId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, recipeId_); + .computeUInt32Size(9, recipeId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +196,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq other = (emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq) obj; - if (getRecipeId() - != other.getRecipeId()) return false; if (getAssistAvatar() != other.getAssistAvatar()) return false; + if (getRecipeId() + != other.getRecipeId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +211,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RECIPE_ID_FIELD_NUMBER; - hash = (53 * hash) + getRecipeId(); hash = (37 * hash) + ASSIST_AVATAR_FIELD_NUMBER; hash = (53 * hash) + getAssistAvatar(); + hash = (37 * hash) + RECIPE_ID_FIELD_NUMBER; + hash = (53 * hash) + getRecipeId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +312,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7878
-     * Obf: OKKPNPMEOJN
+     * CmdId: 6593
+     * obf: FHKJJIBPEBH
      *
* * Protobuf type {@code PlayerCookArgsReq} @@ -353,10 +353,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - recipeId_ = 0; - assistAvatar_ = 0; + recipeId_ = 0; + return this; } @@ -383,8 +383,8 @@ public emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq b @java.lang.Override public emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq buildPartial() { emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq result = new emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq(this); - result.recipeId_ = recipeId_; result.assistAvatar_ = assistAvatar_; + result.recipeId_ = recipeId_; onBuilt(); return result; } @@ -433,12 +433,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq other) { if (other == emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq.getDefaultInstance()) return this; - if (other.getRecipeId() != 0) { - setRecipeId(other.getRecipeId()); - } if (other.getAssistAvatar() != 0) { setAssistAvatar(other.getAssistAvatar()); } + if (other.getRecipeId() != 0) { + setRecipeId(other.getRecipeId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +468,64 @@ public Builder mergeFrom( return this; } - private int recipeId_ ; + private int assistAvatar_ ; /** - * uint32 recipe_id = 13; - * @return The recipeId. + * uint32 assist_avatar = 8; + * @return The assistAvatar. */ @java.lang.Override - public int getRecipeId() { - return recipeId_; + public int getAssistAvatar() { + return assistAvatar_; } /** - * uint32 recipe_id = 13; - * @param value The recipeId to set. + * uint32 assist_avatar = 8; + * @param value The assistAvatar to set. * @return This builder for chaining. */ - public Builder setRecipeId(int value) { + public Builder setAssistAvatar(int value) { - recipeId_ = value; + assistAvatar_ = value; onChanged(); return this; } /** - * uint32 recipe_id = 13; + * uint32 assist_avatar = 8; * @return This builder for chaining. */ - public Builder clearRecipeId() { + public Builder clearAssistAvatar() { - recipeId_ = 0; + assistAvatar_ = 0; onChanged(); return this; } - private int assistAvatar_ ; + private int recipeId_ ; /** - * uint32 assist_avatar = 10; - * @return The assistAvatar. + * uint32 recipe_id = 9; + * @return The recipeId. */ @java.lang.Override - public int getAssistAvatar() { - return assistAvatar_; + public int getRecipeId() { + return recipeId_; } /** - * uint32 assist_avatar = 10; - * @param value The assistAvatar to set. + * uint32 recipe_id = 9; + * @param value The recipeId to set. * @return This builder for chaining. */ - public Builder setAssistAvatar(int value) { + public Builder setRecipeId(int value) { - assistAvatar_ = value; + recipeId_ = value; onChanged(); return this; } /** - * uint32 assist_avatar = 10; + * uint32 recipe_id = 9; * @return This builder for chaining. */ - public Builder clearAssistAvatar() { + public Builder clearRecipeId() { - assistAvatar_ = 0; + recipeId_ = 0; onChanged(); return this; } @@ -597,8 +597,8 @@ public emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq g static { java.lang.String[] descriptorData = { "\n\027PlayerCookArgsReq.proto\"=\n\021PlayerCookA" + - "rgsReq\022\021\n\trecipe_id\030\r \001(\r\022\025\n\rassist_avat" + - "ar\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006p" + + "rgsReq\022\025\n\rassist_avatar\030\010 \001(\r\022\021\n\trecipe_" + + "id\030\t \001(\rB\033\n\031emu.grasscutter.net.protob\006p" + "roto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +610,7 @@ public emu.grasscutter.net.proto.PlayerCookArgsReqOuterClass.PlayerCookArgsReq g internal_static_PlayerCookArgsReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerCookArgsReq_descriptor, - new java.lang.String[] { "RecipeId", "AssistAvatar", }); + new java.lang.String[] { "AssistAvatar", "RecipeId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookReqOuterClass.java index b00067e3ca8..b567d1f183a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookReqOuterClass.java @@ -19,10 +19,10 @@ public interface PlayerCookReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 qte_quality = 8; - * @return The qteQuality. + * uint32 assist_avatar = 4; + * @return The assistAvatar. */ - int getQteQuality(); + int getAssistAvatar(); /** * uint32 cook_count = 13; @@ -37,15 +37,15 @@ public interface PlayerCookReqOrBuilder extends int getRecipeId(); /** - * uint32 assist_avatar = 5; - * @return The assistAvatar. + * uint32 qte_quality = 6; + * @return The qteQuality. */ - int getAssistAvatar(); + int getQteQuality(); } /** * 
-   * CmdId: 27404
-   * Obf: JNPPJCJFMJO
+   * CmdId: 192
+   * obf: OBPNJHOFBED
    *
* * Protobuf type {@code PlayerCookReq} @@ -92,12 +92,12 @@ private PlayerCookReq( case 0: done = true; break; - case 40: { + case 32: { assistAvatar_ = input.readUInt32(); break; } - case 64: { + case 48: { qteQuality_ = input.readUInt32(); break; @@ -144,15 +144,15 @@ private PlayerCookReq( emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq.class, emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq.Builder.class); } - public static final int QTE_QUALITY_FIELD_NUMBER = 8; - private int qteQuality_; + public static final int ASSIST_AVATAR_FIELD_NUMBER = 4; + private int assistAvatar_; /** - * uint32 qte_quality = 8; - * @return The qteQuality. + * uint32 assist_avatar = 4; + * @return The assistAvatar. */ @java.lang.Override - public int getQteQuality() { - return qteQuality_; + public int getAssistAvatar() { + return assistAvatar_; } public static final int COOK_COUNT_FIELD_NUMBER = 13; @@ -177,15 +177,15 @@ public int getRecipeId() { return recipeId_; } - public static final int ASSIST_AVATAR_FIELD_NUMBER = 5; - private int assistAvatar_; + public static final int QTE_QUALITY_FIELD_NUMBER = 6; + private int qteQuality_; /** - * uint32 assist_avatar = 5; - * @return The assistAvatar. + * uint32 qte_quality = 6; + * @return The qteQuality. */ @java.lang.Override - public int getAssistAvatar() { - return assistAvatar_; + public int getQteQuality() { + return qteQuality_; } private byte memoizedIsInitialized = -1; @@ -203,10 +203,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (assistAvatar_ != 0) { - output.writeUInt32(5, assistAvatar_); + output.writeUInt32(4, assistAvatar_); } if (qteQuality_ != 0) { - output.writeUInt32(8, qteQuality_); + output.writeUInt32(6, qteQuality_); } if (recipeId_ != 0) { output.writeUInt32(11, recipeId_); @@ -225,11 +225,11 @@ public int getSerializedSize() { size = 0; if (assistAvatar_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, assistAvatar_); + .computeUInt32Size(4, assistAvatar_); } if (qteQuality_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, qteQuality_); + .computeUInt32Size(6, qteQuality_); } if (recipeId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -254,14 +254,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq other = (emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq) obj; - if (getQteQuality() - != other.getQteQuality()) return false; + if (getAssistAvatar() + != other.getAssistAvatar()) return false; if (getCookCount() != other.getCookCount()) return false; if (getRecipeId() != other.getRecipeId()) return false; - if (getAssistAvatar() - != other.getAssistAvatar()) return false; + if (getQteQuality() + != other.getQteQuality()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -273,14 +273,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + QTE_QUALITY_FIELD_NUMBER; - hash = (53 * hash) + getQteQuality(); + hash = (37 * hash) + ASSIST_AVATAR_FIELD_NUMBER; + hash = (53 * hash) + getAssistAvatar(); hash = (37 * hash) + COOK_COUNT_FIELD_NUMBER; hash = (53 * hash) + getCookCount(); hash = (37 * hash) + RECIPE_ID_FIELD_NUMBER; hash = (53 * hash) + getRecipeId(); - hash = (37 * hash) + ASSIST_AVATAR_FIELD_NUMBER; - hash = (53 * hash) + getAssistAvatar(); + hash = (37 * hash) + QTE_QUALITY_FIELD_NUMBER; + hash = (53 * hash) + getQteQuality(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -378,8 +378,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27404
-     * Obf: JNPPJCJFMJO
+     * CmdId: 192
+     * obf: OBPNJHOFBED
      *
* * Protobuf type {@code PlayerCookReq} @@ -419,13 +419,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - qteQuality_ = 0; + assistAvatar_ = 0; cookCount_ = 0; recipeId_ = 0; - assistAvatar_ = 0; + qteQuality_ = 0; return this; } @@ -453,10 +453,10 @@ public emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq build() { @java.lang.Override public emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq buildPartial() { emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq result = new emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq(this); - result.qteQuality_ = qteQuality_; + result.assistAvatar_ = assistAvatar_; result.cookCount_ = cookCount_; result.recipeId_ = recipeId_; - result.assistAvatar_ = assistAvatar_; + result.qteQuality_ = qteQuality_; onBuilt(); return result; } @@ -505,8 +505,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq other) { if (other == emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq.getDefaultInstance()) return this; - if (other.getQteQuality() != 0) { - setQteQuality(other.getQteQuality()); + if (other.getAssistAvatar() != 0) { + setAssistAvatar(other.getAssistAvatar()); } if (other.getCookCount() != 0) { setCookCount(other.getCookCount()); @@ -514,8 +514,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCookReqOuterClass.Playe if (other.getRecipeId() != 0) { setRecipeId(other.getRecipeId()); } - if (other.getAssistAvatar() != 0) { - setAssistAvatar(other.getAssistAvatar()); + if (other.getQteQuality() != 0) { + setQteQuality(other.getQteQuality()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -546,33 +546,33 @@ public Builder mergeFrom( return this; } - private int qteQuality_ ; + private int assistAvatar_ ; /** - * uint32 qte_quality = 8; - * @return The qteQuality. + * uint32 assist_avatar = 4; + * @return The assistAvatar. */ @java.lang.Override - public int getQteQuality() { - return qteQuality_; + public int getAssistAvatar() { + return assistAvatar_; } /** - * uint32 qte_quality = 8; - * @param value The qteQuality to set. + * uint32 assist_avatar = 4; + * @param value The assistAvatar to set. * @return This builder for chaining. */ - public Builder setQteQuality(int value) { + public Builder setAssistAvatar(int value) { - qteQuality_ = value; + assistAvatar_ = value; onChanged(); return this; } /** - * uint32 qte_quality = 8; + * uint32 assist_avatar = 4; * @return This builder for chaining. */ - public Builder clearQteQuality() { + public Builder clearAssistAvatar() { - qteQuality_ = 0; + assistAvatar_ = 0; onChanged(); return this; } @@ -639,33 +639,33 @@ public Builder clearRecipeId() { return this; } - private int assistAvatar_ ; + private int qteQuality_ ; /** - * uint32 assist_avatar = 5; - * @return The assistAvatar. + * uint32 qte_quality = 6; + * @return The qteQuality. */ @java.lang.Override - public int getAssistAvatar() { - return assistAvatar_; + public int getQteQuality() { + return qteQuality_; } /** - * uint32 assist_avatar = 5; - * @param value The assistAvatar to set. + * uint32 qte_quality = 6; + * @param value The qteQuality to set. * @return This builder for chaining. */ - public Builder setAssistAvatar(int value) { + public Builder setQteQuality(int value) { - assistAvatar_ = value; + qteQuality_ = value; onChanged(); return this; } /** - * uint32 assist_avatar = 5; + * uint32 qte_quality = 6; * @return This builder for chaining. */ - public Builder clearAssistAvatar() { + public Builder clearQteQuality() { - assistAvatar_ = 0; + qteQuality_ = 0; onChanged(); return this; } @@ -736,9 +736,9 @@ public emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq getDefaul descriptor; static { java.lang.String[] descriptorData = { - "\n\023PlayerCookReq.proto\"b\n\rPlayerCookReq\022\023" + - "\n\013qte_quality\030\010 \001(\r\022\022\n\ncook_count\030\r \001(\r\022" + - "\021\n\trecipe_id\030\013 \001(\r\022\025\n\rassist_avatar\030\005 \001(" + + "\n\023PlayerCookReq.proto\"b\n\rPlayerCookReq\022\025" + + "\n\rassist_avatar\030\004 \001(\r\022\022\n\ncook_count\030\r \001(" + + "\r\022\021\n\trecipe_id\030\013 \001(\r\022\023\n\013qte_quality\030\006 \001(" + "\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -750,7 +750,7 @@ public emu.grasscutter.net.proto.PlayerCookReqOuterClass.PlayerCookReq getDefaul internal_static_PlayerCookReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerCookReq_descriptor, - new java.lang.String[] { "QteQuality", "CookCount", "RecipeId", "AssistAvatar", }); + new java.lang.String[] { "AssistAvatar", "CookCount", "RecipeId", "QteQuality", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookRspOuterClass.java index fbaf6b4c09d..f2decc043a6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerCookRspOuterClass.java @@ -19,90 +19,90 @@ public interface PlayerCookRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 9; - * @return The retcode. + * uint32 cook_count = 1; + * @return The cookCount. */ - int getRetcode(); + int getCookCount(); /** - * uint32 cook_count = 8; - * @return The cookCount. + * repeated .ItemParam extral_item_list = 3; */ - int getCookCount(); + java.util.List + getExtralItemListList(); + /** + * repeated .ItemParam extral_item_list = 3; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getExtralItemList(int index); + /** + * repeated .ItemParam extral_item_list = 3; + */ + int getExtralItemListCount(); + /** + * repeated .ItemParam extral_item_list = 3; + */ + java.util.List + getExtralItemListOrBuilderList(); + /** + * repeated .ItemParam extral_item_list = 3; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getExtralItemListOrBuilder( + int index); /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; * @return Whether the recipeData field is set. */ boolean hasRecipeData(); /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; * @return The recipeData. */ emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData getRecipeData(); /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilder getRecipeDataOrBuilder(); /** - * uint32 qte_quality = 6; - * @return The qteQuality. + * int32 retcode = 11; + * @return The retcode. */ - int getQteQuality(); + int getRetcode(); /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ java.util.List getItemListList(); /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index); /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ int getItemListCount(); /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ java.util.List getItemListOrBuilderList(); /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index); /** - * repeated .ItemParam extral_item_list = 15; - */ - java.util.List - getExtralItemListList(); - /** - * repeated .ItemParam extral_item_list = 15; - */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getExtralItemList(int index); - /** - * repeated .ItemParam extral_item_list = 15; - */ - int getExtralItemListCount(); - /** - * repeated .ItemParam extral_item_list = 15; - */ - java.util.List - getExtralItemListOrBuilderList(); - /** - * repeated .ItemParam extral_item_list = 15; + * uint32 qte_quality = 15; + * @return The qteQuality. */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getExtralItemListOrBuilder( - int index); + int getQteQuality(); } /** * 
-   * CmdId: 1250
-   * Obf: GDCGPFPELAO
+   * CmdId: 23979
+   * obf: OJPDNBKPIKI
    *
* * Protobuf type {@code PlayerCookRsp} @@ -117,8 +117,8 @@ private PlayerCookRsp(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } private PlayerCookRsp() { - itemList_ = java.util.Collections.emptyList(); extralItemList_ = java.util.Collections.emptyList(); + itemList_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -152,7 +152,21 @@ private PlayerCookRsp( case 0: done = true; break; - case 42: { + case 8: { + + cookCount_ = input.readUInt32(); + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + extralItemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + extralItemList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + break; + } + case 74: { emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.Builder subBuilder = null; if (recipeData_ != null) { subBuilder = recipeData_.toBuilder(); @@ -165,37 +179,23 @@ private PlayerCookRsp( break; } - case 48: { - - qteQuality_ = input.readUInt32(); - break; - } - case 64: { - - cookCount_ = input.readUInt32(); - break; - } - case 72: { + case 88: { retcode_ = input.readInt32(); break; } - case 82: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { + case 98: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { itemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000002; } itemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 122: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - extralItemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - extralItemList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + case 120: { + + qteQuality_ = input.readUInt32(); break; } default: { @@ -214,10 +214,10 @@ private PlayerCookRsp( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - itemList_ = java.util.Collections.unmodifiableList(itemList_); + extralItemList_ = java.util.Collections.unmodifiableList(extralItemList_); } if (((mutable_bitField0_ & 0x00000002) != 0)) { - extralItemList_ = java.util.Collections.unmodifiableList(extralItemList_); + itemList_ = java.util.Collections.unmodifiableList(itemList_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -236,32 +236,61 @@ private PlayerCookRsp( emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp.class, emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 9; - private int retcode_; + public static final int COOK_COUNT_FIELD_NUMBER = 1; + private int cookCount_; /** - * int32 retcode = 9; - * @return The retcode. + * uint32 cook_count = 1; + * @return The cookCount. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getCookCount() { + return cookCount_; } - public static final int COOK_COUNT_FIELD_NUMBER = 8; - private int cookCount_; + public static final int EXTRAL_ITEM_LIST_FIELD_NUMBER = 3; + private java.util.List extralItemList_; /** - * uint32 cook_count = 8; - * @return The cookCount. + * repeated .ItemParam extral_item_list = 3; */ @java.lang.Override - public int getCookCount() { - return cookCount_; + public java.util.List getExtralItemListList() { + return extralItemList_; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + @java.lang.Override + public java.util.List + getExtralItemListOrBuilderList() { + return extralItemList_; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + @java.lang.Override + public int getExtralItemListCount() { + return extralItemList_.size(); + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getExtralItemList(int index) { + return extralItemList_.get(index); + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getExtralItemListOrBuilder( + int index) { + return extralItemList_.get(index); } - public static final int RECIPE_DATA_FIELD_NUMBER = 5; + public static final int RECIPE_DATA_FIELD_NUMBER = 9; private emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData recipeData_; /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; * @return Whether the recipeData field is set. */ @java.lang.Override @@ -269,7 +298,7 @@ public boolean hasRecipeData() { return recipeData_ != null; } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; * @return The recipeData. */ @java.lang.Override @@ -277,35 +306,35 @@ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData getReci return recipeData_ == null ? emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.getDefaultInstance() : recipeData_; } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ @java.lang.Override public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilder getRecipeDataOrBuilder() { return getRecipeData(); } - public static final int QTE_QUALITY_FIELD_NUMBER = 6; - private int qteQuality_; + public static final int RETCODE_FIELD_NUMBER = 11; + private int retcode_; /** - * uint32 qte_quality = 6; - * @return The qteQuality. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getQteQuality() { - return qteQuality_; + public int getRetcode() { + return retcode_; } - public static final int ITEM_LIST_FIELD_NUMBER = 10; + public static final int ITEM_LIST_FIELD_NUMBER = 12; private java.util.List itemList_; /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ @java.lang.Override public java.util.List getItemListList() { return itemList_; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ @java.lang.Override public java.util.List @@ -313,21 +342,21 @@ public java.util.List g return itemList_; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ @java.lang.Override public int getItemListCount() { return itemList_.size(); } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { return itemList_.get(index); } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( @@ -335,44 +364,15 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL return itemList_.get(index); } - public static final int EXTRAL_ITEM_LIST_FIELD_NUMBER = 15; - private java.util.List extralItemList_; - /** - * repeated .ItemParam extral_item_list = 15; - */ - @java.lang.Override - public java.util.List getExtralItemListList() { - return extralItemList_; - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - @java.lang.Override - public java.util.List - getExtralItemListOrBuilderList() { - return extralItemList_; - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - @java.lang.Override - public int getExtralItemListCount() { - return extralItemList_.size(); - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getExtralItemList(int index) { - return extralItemList_.get(index); - } + public static final int QTE_QUALITY_FIELD_NUMBER = 15; + private int qteQuality_; /** - * repeated .ItemParam extral_item_list = 15; + * uint32 qte_quality = 15; + * @return The qteQuality. */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getExtralItemListOrBuilder( - int index) { - return extralItemList_.get(index); + public int getQteQuality() { + return qteQuality_; } private byte memoizedIsInitialized = -1; @@ -389,23 +389,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (recipeData_ != null) { - output.writeMessage(5, getRecipeData()); + if (cookCount_ != 0) { + output.writeUInt32(1, cookCount_); } - if (qteQuality_ != 0) { - output.writeUInt32(6, qteQuality_); + for (int i = 0; i < extralItemList_.size(); i++) { + output.writeMessage(3, extralItemList_.get(i)); } - if (cookCount_ != 0) { - output.writeUInt32(8, cookCount_); + if (recipeData_ != null) { + output.writeMessage(9, getRecipeData()); } if (retcode_ != 0) { - output.writeInt32(9, retcode_); + output.writeInt32(11, retcode_); } for (int i = 0; i < itemList_.size(); i++) { - output.writeMessage(10, itemList_.get(i)); + output.writeMessage(12, itemList_.get(i)); } - for (int i = 0; i < extralItemList_.size(); i++) { - output.writeMessage(15, extralItemList_.get(i)); + if (qteQuality_ != 0) { + output.writeUInt32(15, qteQuality_); } unknownFields.writeTo(output); } @@ -416,29 +416,29 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (recipeData_ != null) { + if (cookCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, getRecipeData()); + .computeUInt32Size(1, cookCount_); } - if (qteQuality_ != 0) { + for (int i = 0; i < extralItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, qteQuality_); + .computeMessageSize(3, extralItemList_.get(i)); } - if (cookCount_ != 0) { + if (recipeData_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, cookCount_); + .computeMessageSize(9, getRecipeData()); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, retcode_); + .computeInt32Size(11, retcode_); } for (int i = 0; i < itemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, itemList_.get(i)); + .computeMessageSize(12, itemList_.get(i)); } - for (int i = 0; i < extralItemList_.size(); i++) { + if (qteQuality_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, extralItemList_.get(i)); + .computeUInt32Size(15, qteQuality_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -455,21 +455,21 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp other = (emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; if (getCookCount() != other.getCookCount()) return false; + if (!getExtralItemListList() + .equals(other.getExtralItemListList())) return false; if (hasRecipeData() != other.hasRecipeData()) return false; if (hasRecipeData()) { if (!getRecipeData() .equals(other.getRecipeData())) return false; } - if (getQteQuality() - != other.getQteQuality()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!getItemListList() .equals(other.getItemListList())) return false; - if (!getExtralItemListList() - .equals(other.getExtralItemListList())) return false; + if (getQteQuality() + != other.getQteQuality()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -481,24 +481,24 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + COOK_COUNT_FIELD_NUMBER; hash = (53 * hash) + getCookCount(); + if (getExtralItemListCount() > 0) { + hash = (37 * hash) + EXTRAL_ITEM_LIST_FIELD_NUMBER; + hash = (53 * hash) + getExtralItemListList().hashCode(); + } if (hasRecipeData()) { hash = (37 * hash) + RECIPE_DATA_FIELD_NUMBER; hash = (53 * hash) + getRecipeData().hashCode(); } - hash = (37 * hash) + QTE_QUALITY_FIELD_NUMBER; - hash = (53 * hash) + getQteQuality(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); if (getItemListCount() > 0) { hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemListList().hashCode(); } - if (getExtralItemListCount() > 0) { - hash = (37 * hash) + EXTRAL_ITEM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getExtralItemListList().hashCode(); - } + hash = (37 * hash) + QTE_QUALITY_FIELD_NUMBER; + hash = (53 * hash) + getQteQuality(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -596,8 +596,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 1250
-     * Obf: GDCGPFPELAO
+     * CmdId: 23979
+     * obf: OJPDNBKPIKI
      *
* * Protobuf type {@code PlayerCookRsp} @@ -632,37 +632,37 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getItemListFieldBuilder(); getExtralItemListFieldBuilder(); + getItemListFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; - cookCount_ = 0; + if (extralItemListBuilder_ == null) { + extralItemList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + extralItemListBuilder_.clear(); + } if (recipeDataBuilder_ == null) { recipeData_ = null; } else { recipeData_ = null; recipeDataBuilder_ = null; } - qteQuality_ = 0; + retcode_ = 0; if (itemListBuilder_ == null) { itemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - itemListBuilder_.clear(); - } - if (extralItemListBuilder_ == null) { - extralItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); } else { - extralItemListBuilder_.clear(); + itemListBuilder_.clear(); } + qteQuality_ = 0; + return this; } @@ -690,32 +690,32 @@ public emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp build() { public emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp buildPartial() { emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp result = new emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp(this); int from_bitField0_ = bitField0_; - result.retcode_ = retcode_; result.cookCount_ = cookCount_; + if (extralItemListBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + extralItemList_ = java.util.Collections.unmodifiableList(extralItemList_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.extralItemList_ = extralItemList_; + } else { + result.extralItemList_ = extralItemListBuilder_.build(); + } if (recipeDataBuilder_ == null) { result.recipeData_ = recipeData_; } else { result.recipeData_ = recipeDataBuilder_.build(); } - result.qteQuality_ = qteQuality_; + result.retcode_ = retcode_; if (itemListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { itemList_ = java.util.Collections.unmodifiableList(itemList_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.itemList_ = itemList_; } else { result.itemList_ = itemListBuilder_.build(); } - if (extralItemListBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { - extralItemList_ = java.util.Collections.unmodifiableList(extralItemList_); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.extralItemList_ = extralItemList_; - } else { - result.extralItemList_ = extralItemListBuilder_.build(); - } + result.qteQuality_ = qteQuality_; onBuilt(); return result; } @@ -764,23 +764,46 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp other) { if (other == emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp.getDefaultInstance()) return this; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (other.getCookCount() != 0) { setCookCount(other.getCookCount()); } + if (extralItemListBuilder_ == null) { + if (!other.extralItemList_.isEmpty()) { + if (extralItemList_.isEmpty()) { + extralItemList_ = other.extralItemList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureExtralItemListIsMutable(); + extralItemList_.addAll(other.extralItemList_); + } + onChanged(); + } + } else { + if (!other.extralItemList_.isEmpty()) { + if (extralItemListBuilder_.isEmpty()) { + extralItemListBuilder_.dispose(); + extralItemListBuilder_ = null; + extralItemList_ = other.extralItemList_; + bitField0_ = (bitField0_ & ~0x00000001); + extralItemListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getExtralItemListFieldBuilder() : null; + } else { + extralItemListBuilder_.addAllMessages(other.extralItemList_); + } + } + } if (other.hasRecipeData()) { mergeRecipeData(other.getRecipeData()); } - if (other.getQteQuality() != 0) { - setQteQuality(other.getQteQuality()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } if (itemListBuilder_ == null) { if (!other.itemList_.isEmpty()) { if (itemList_.isEmpty()) { itemList_ = other.itemList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureItemListIsMutable(); itemList_.addAll(other.itemList_); @@ -793,7 +816,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCookRspOuterClass.Playe itemListBuilder_.dispose(); itemListBuilder_ = null; itemList_ = other.itemList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); itemListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getItemListFieldBuilder() : null; @@ -802,31 +825,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerCookRspOuterClass.Playe } } } - if (extralItemListBuilder_ == null) { - if (!other.extralItemList_.isEmpty()) { - if (extralItemList_.isEmpty()) { - extralItemList_ = other.extralItemList_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureExtralItemListIsMutable(); - extralItemList_.addAll(other.extralItemList_); - } - onChanged(); - } - } else { - if (!other.extralItemList_.isEmpty()) { - if (extralItemListBuilder_.isEmpty()) { - extralItemListBuilder_.dispose(); - extralItemListBuilder_ = null; - extralItemList_ = other.extralItemList_; - bitField0_ = (bitField0_ & ~0x00000002); - extralItemListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getExtralItemListFieldBuilder() : null; - } else { - extralItemListBuilder_.addAllMessages(other.extralItemList_); - } - } + if (other.getQteQuality() != 0) { + setQteQuality(other.getQteQuality()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -858,80 +858,289 @@ public Builder mergeFrom( } private int bitField0_; - private int retcode_ ; + private int cookCount_ ; /** - * int32 retcode = 9; - * @return The retcode. + * uint32 cook_count = 1; + * @return The cookCount. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getCookCount() { + return cookCount_; } /** - * int32 retcode = 9; - * @param value The retcode to set. + * uint32 cook_count = 1; + * @param value The cookCount to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setCookCount(int value) { - retcode_ = value; + cookCount_ = value; onChanged(); return this; } /** - * int32 retcode = 9; + * uint32 cook_count = 1; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearCookCount() { - retcode_ = 0; + cookCount_ = 0; onChanged(); return this; } - private int cookCount_ ; + private java.util.List extralItemList_ = + java.util.Collections.emptyList(); + private void ensureExtralItemListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + extralItemList_ = new java.util.ArrayList(extralItemList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> extralItemListBuilder_; + /** - * uint32 cook_count = 8; - * @return The cookCount. + * repeated .ItemParam extral_item_list = 3; */ - @java.lang.Override - public int getCookCount() { - return cookCount_; + public java.util.List getExtralItemListList() { + if (extralItemListBuilder_ == null) { + return java.util.Collections.unmodifiableList(extralItemList_); + } else { + return extralItemListBuilder_.getMessageList(); + } } /** - * uint32 cook_count = 8; - * @param value The cookCount to set. - * @return This builder for chaining. + * repeated .ItemParam extral_item_list = 3; */ - public Builder setCookCount(int value) { - - cookCount_ = value; - onChanged(); + public int getExtralItemListCount() { + if (extralItemListBuilder_ == null) { + return extralItemList_.size(); + } else { + return extralItemListBuilder_.getCount(); + } + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getExtralItemList(int index) { + if (extralItemListBuilder_ == null) { + return extralItemList_.get(index); + } else { + return extralItemListBuilder_.getMessage(index); + } + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public Builder setExtralItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (extralItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureExtralItemListIsMutable(); + extralItemList_.set(index, value); + onChanged(); + } else { + extralItemListBuilder_.setMessage(index, value); + } return this; } /** - * uint32 cook_count = 8; - * @return This builder for chaining. + * repeated .ItemParam extral_item_list = 3; */ - public Builder clearCookCount() { - - cookCount_ = 0; - onChanged(); + public Builder setExtralItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (extralItemListBuilder_ == null) { + ensureExtralItemListIsMutable(); + extralItemList_.set(index, builderForValue.build()); + onChanged(); + } else { + extralItemListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public Builder addExtralItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (extralItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureExtralItemListIsMutable(); + extralItemList_.add(value); + onChanged(); + } else { + extralItemListBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public Builder addExtralItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (extralItemListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureExtralItemListIsMutable(); + extralItemList_.add(index, value); + onChanged(); + } else { + extralItemListBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public Builder addExtralItemList( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (extralItemListBuilder_ == null) { + ensureExtralItemListIsMutable(); + extralItemList_.add(builderForValue.build()); + onChanged(); + } else { + extralItemListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public Builder addExtralItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (extralItemListBuilder_ == null) { + ensureExtralItemListIsMutable(); + extralItemList_.add(index, builderForValue.build()); + onChanged(); + } else { + extralItemListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public Builder addAllExtralItemList( + java.lang.Iterable values) { + if (extralItemListBuilder_ == null) { + ensureExtralItemListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, extralItemList_); + onChanged(); + } else { + extralItemListBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public Builder clearExtralItemList() { + if (extralItemListBuilder_ == null) { + extralItemList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + extralItemListBuilder_.clear(); + } + return this; + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public Builder removeExtralItemList(int index) { + if (extralItemListBuilder_ == null) { + ensureExtralItemListIsMutable(); + extralItemList_.remove(index); + onChanged(); + } else { + extralItemListBuilder_.remove(index); + } return this; } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getExtralItemListBuilder( + int index) { + return getExtralItemListFieldBuilder().getBuilder(index); + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getExtralItemListOrBuilder( + int index) { + if (extralItemListBuilder_ == null) { + return extralItemList_.get(index); } else { + return extralItemListBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public java.util.List + getExtralItemListOrBuilderList() { + if (extralItemListBuilder_ != null) { + return extralItemListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(extralItemList_); + } + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addExtralItemListBuilder() { + return getExtralItemListFieldBuilder().addBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addExtralItemListBuilder( + int index) { + return getExtralItemListFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + } + /** + * repeated .ItemParam extral_item_list = 3; + */ + public java.util.List + getExtralItemListBuilderList() { + return getExtralItemListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> + getExtralItemListFieldBuilder() { + if (extralItemListBuilder_ == null) { + extralItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( + extralItemList_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + extralItemList_ = null; + } + return extralItemListBuilder_; + } private emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData recipeData_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData, emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.Builder, emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilder> recipeDataBuilder_; /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; * @return Whether the recipeData field is set. */ public boolean hasRecipeData() { return recipeDataBuilder_ != null || recipeData_ != null; } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; * @return The recipeData. */ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData getRecipeData() { @@ -942,7 +1151,7 @@ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData getReci } } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ public Builder setRecipeData(emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData value) { if (recipeDataBuilder_ == null) { @@ -958,7 +1167,7 @@ public Builder setRecipeData(emu.grasscutter.net.proto.CookRecipeDataOuterClass. return this; } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ public Builder setRecipeData( emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.Builder builderForValue) { @@ -972,7 +1181,7 @@ public Builder setRecipeData( return this; } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ public Builder mergeRecipeData(emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData value) { if (recipeDataBuilder_ == null) { @@ -990,7 +1199,7 @@ public Builder mergeRecipeData(emu.grasscutter.net.proto.CookRecipeDataOuterClas return this; } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ public Builder clearRecipeData() { if (recipeDataBuilder_ == null) { @@ -1004,7 +1213,7 @@ public Builder clearRecipeData() { return this; } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.Builder getRecipeDataBuilder() { @@ -1012,7 +1221,7 @@ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.Builder return getRecipeDataFieldBuilder().getBuilder(); } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilder getRecipeDataOrBuilder() { if (recipeDataBuilder_ != null) { @@ -1023,7 +1232,7 @@ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilde } } /** - * .CookRecipeData recipe_data = 5; + * .CookRecipeData recipe_data = 9; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData, emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeData.Builder, emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilder> @@ -1039,33 +1248,33 @@ public emu.grasscutter.net.proto.CookRecipeDataOuterClass.CookRecipeDataOrBuilde return recipeDataBuilder_; } - private int qteQuality_ ; + private int retcode_ ; /** - * uint32 qte_quality = 6; - * @return The qteQuality. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getQteQuality() { - return qteQuality_; + public int getRetcode() { + return retcode_; } /** - * uint32 qte_quality = 6; - * @param value The qteQuality to set. + * int32 retcode = 11; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setQteQuality(int value) { + public Builder setRetcode(int value) { - qteQuality_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 qte_quality = 6; + * int32 retcode = 11; * @return This builder for chaining. */ - public Builder clearQteQuality() { + public Builder clearRetcode() { - qteQuality_ = 0; + retcode_ = 0; onChanged(); return this; } @@ -1073,9 +1282,9 @@ public Builder clearQteQuality() { private java.util.List itemList_ = java.util.Collections.emptyList(); private void ensureItemListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { itemList_ = new java.util.ArrayList(itemList_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -1083,7 +1292,7 @@ private void ensureItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_; /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public java.util.List getItemListList() { if (itemListBuilder_ == null) { @@ -1093,7 +1302,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public int getItemListCount() { if (itemListBuilder_ == null) { @@ -1103,7 +1312,7 @@ public int getItemListCount() { } } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { if (itemListBuilder_ == null) { @@ -1113,7 +1322,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int i } } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1130,7 +1339,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1144,7 +1353,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemListBuilder_ == null) { @@ -1160,7 +1369,7 @@ public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemPar return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1177,7 +1386,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder addItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1191,7 +1400,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1205,7 +1414,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder addAllItemList( java.lang.Iterable values) { @@ -1220,12 +1429,12 @@ public Builder addAllItemList( return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder clearItemList() { if (itemListBuilder_ == null) { itemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { itemListBuilder_.clear(); @@ -1233,7 +1442,7 @@ public Builder clearItemList() { return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public Builder removeItemList(int index) { if (itemListBuilder_ == null) { @@ -1246,14 +1455,14 @@ public Builder removeItemList(int index) { return this; } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder( int index) { return getItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index) { @@ -1263,7 +1472,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL } } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public java.util.List getItemListOrBuilderList() { @@ -1274,14 +1483,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL } } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() { return getItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder( int index) { @@ -1289,7 +1498,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemLi index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 10; + * repeated .ItemParam item_list = 12; */ public java.util.List getItemListBuilderList() { @@ -1302,7 +1511,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemLi itemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( itemList_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); itemList_ = null; @@ -1310,245 +1519,36 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemLi return itemListBuilder_; } - private java.util.List extralItemList_ = - java.util.Collections.emptyList(); - private void ensureExtralItemListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - extralItemList_ = new java.util.ArrayList(extralItemList_); - bitField0_ |= 0x00000002; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> extralItemListBuilder_; - - /** - * repeated .ItemParam extral_item_list = 15; - */ - public java.util.List getExtralItemListList() { - if (extralItemListBuilder_ == null) { - return java.util.Collections.unmodifiableList(extralItemList_); - } else { - return extralItemListBuilder_.getMessageList(); - } - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public int getExtralItemListCount() { - if (extralItemListBuilder_ == null) { - return extralItemList_.size(); - } else { - return extralItemListBuilder_.getCount(); - } - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getExtralItemList(int index) { - if (extralItemListBuilder_ == null) { - return extralItemList_.get(index); - } else { - return extralItemListBuilder_.getMessage(index); - } - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public Builder setExtralItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (extralItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureExtralItemListIsMutable(); - extralItemList_.set(index, value); - onChanged(); - } else { - extralItemListBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public Builder setExtralItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (extralItemListBuilder_ == null) { - ensureExtralItemListIsMutable(); - extralItemList_.set(index, builderForValue.build()); - onChanged(); - } else { - extralItemListBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public Builder addExtralItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (extralItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureExtralItemListIsMutable(); - extralItemList_.add(value); - onChanged(); - } else { - extralItemListBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public Builder addExtralItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (extralItemListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureExtralItemListIsMutable(); - extralItemList_.add(index, value); - onChanged(); - } else { - extralItemListBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public Builder addExtralItemList( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (extralItemListBuilder_ == null) { - ensureExtralItemListIsMutable(); - extralItemList_.add(builderForValue.build()); - onChanged(); - } else { - extralItemListBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public Builder addExtralItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (extralItemListBuilder_ == null) { - ensureExtralItemListIsMutable(); - extralItemList_.add(index, builderForValue.build()); - onChanged(); - } else { - extralItemListBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } + private int qteQuality_ ; /** - * repeated .ItemParam extral_item_list = 15; + * uint32 qte_quality = 15; + * @return The qteQuality. */ - public Builder addAllExtralItemList( - java.lang.Iterable values) { - if (extralItemListBuilder_ == null) { - ensureExtralItemListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, extralItemList_); - onChanged(); - } else { - extralItemListBuilder_.addAllMessages(values); - } - return this; + @java.lang.Override + public int getQteQuality() { + return qteQuality_; } /** - * repeated .ItemParam extral_item_list = 15; + * uint32 qte_quality = 15; + * @param value The qteQuality to set. + * @return This builder for chaining. */ - public Builder clearExtralItemList() { - if (extralItemListBuilder_ == null) { - extralItemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); - onChanged(); - } else { - extralItemListBuilder_.clear(); - } + public Builder setQteQuality(int value) { + + qteQuality_ = value; + onChanged(); return this; } /** - * repeated .ItemParam extral_item_list = 15; + * uint32 qte_quality = 15; + * @return This builder for chaining. */ - public Builder removeExtralItemList(int index) { - if (extralItemListBuilder_ == null) { - ensureExtralItemListIsMutable(); - extralItemList_.remove(index); - onChanged(); - } else { - extralItemListBuilder_.remove(index); - } + public Builder clearQteQuality() { + + qteQuality_ = 0; + onChanged(); return this; } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getExtralItemListBuilder( - int index) { - return getExtralItemListFieldBuilder().getBuilder(index); - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getExtralItemListOrBuilder( - int index) { - if (extralItemListBuilder_ == null) { - return extralItemList_.get(index); } else { - return extralItemListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public java.util.List - getExtralItemListOrBuilderList() { - if (extralItemListBuilder_ != null) { - return extralItemListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(extralItemList_); - } - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addExtralItemListBuilder() { - return getExtralItemListFieldBuilder().addBuilder( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addExtralItemListBuilder( - int index) { - return getExtralItemListFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); - } - /** - * repeated .ItemParam extral_item_list = 15; - */ - public java.util.List - getExtralItemListBuilderList() { - return getExtralItemListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> - getExtralItemListFieldBuilder() { - if (extralItemListBuilder_ == null) { - extralItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( - extralItemList_, - ((bitField0_ & 0x00000002) != 0), - getParentForChildren(), - isClean()); - extralItemList_ = null; - } - return extralItemListBuilder_; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1616,28 +1616,28 @@ public emu.grasscutter.net.proto.PlayerCookRspOuterClass.PlayerCookRsp getDefaul descriptor; static { java.lang.String[] descriptorData = { - "\n\023PlayerCookRsp.proto\032\024CookRecipeData.pr" + - "oto\032\017ItemParam.proto\"\264\001\n\rPlayerCookRsp\022\017" + - "\n\007retcode\030\t \001(\005\022\022\n\ncook_count\030\010 \001(\r\022$\n\013r" + - "ecipe_data\030\005 \001(\0132\017.CookRecipeData\022\023\n\013qte" + - "_quality\030\006 \001(\r\022\035\n\titem_list\030\n \003(\0132\n.Item" + - "Param\022$\n\020extral_item_list\030\017 \003(\0132\n.ItemPa" + - "ramB\033\n\031emu.grasscutter.net.protob\006proto3" + "\n\023PlayerCookRsp.proto\032\017ItemParam.proto\032\024" + + "CookRecipeData.proto\"\264\001\n\rPlayerCookRsp\022\022" + + "\n\ncook_count\030\001 \001(\r\022$\n\020extral_item_list\030\003" + + " \003(\0132\n.ItemParam\022$\n\013recipe_data\030\t \001(\0132\017." + + "CookRecipeData\022\017\n\007retcode\030\013 \001(\005\022\035\n\titem_" + + "list\030\014 \003(\0132\n.ItemParam\022\023\n\013qte_quality\030\017 " + + "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.CookRecipeDataOuterClass.getDescriptor(), emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(), + emu.grasscutter.net.proto.CookRecipeDataOuterClass.getDescriptor(), }); internal_static_PlayerCookRsp_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_PlayerCookRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_PlayerCookRsp_descriptor, - new java.lang.String[] { "Retcode", "CookCount", "RecipeData", "QteQuality", "ItemList", "ExtralItemList", }); - emu.grasscutter.net.proto.CookRecipeDataOuterClass.getDescriptor(); + new java.lang.String[] { "CookCount", "ExtralItemList", "RecipeData", "Retcode", "ItemList", "QteQuality", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); + emu.grasscutter.net.proto.CookRecipeDataOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillChangeNotifyOuterClass.java index 1a71d5ed6af..2f5b85a0ac6 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillChangeNotifyOuterClass.java @@ -54,6 +54,11 @@ public interface ProudSkillChangeNotifyOrBuilder extends long getAvatarGuid(); } /** + * 
+   * CmdId: 29262
+   * obf: PKMMDCDNCLI
+   *
+ * * Protobuf type {@code ProudSkillChangeNotify} */ public static final class ProudSkillChangeNotify extends @@ -439,6 +444,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 29262
+     * obf: PKMMDCDNCLI
+     *
+ * * Protobuf type {@code ProudSkillChangeNotify} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java index eab40fd8833..e45b9725709 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java @@ -19,6 +19,10 @@ public interface ProudSkillExtraLevelNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** + * 
+     * 三个uint类型可能都不对
+     *
+ * * uint32 talent_index = 3; * @return The talentIndex. */ @@ -43,6 +47,11 @@ public interface ProudSkillExtraLevelNotifyOrBuilder extends int getTalentType(); } /** + * 
+   * CmdId: 28513
+   * obf: DIAFCPCDCPO
+   *
+ * * Protobuf type {@code ProudSkillExtraLevelNotify} */ public static final class ProudSkillExtraLevelNotify extends @@ -142,6 +151,10 @@ private ProudSkillExtraLevelNotify( public static final int TALENT_INDEX_FIELD_NUMBER = 3; private int talentIndex_; /** + * 
+     * 三个uint类型可能都不对
+     *
+ * * uint32 talent_index = 3; * @return The talentIndex. */ @@ -373,6 +386,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 28513
+     * obf: DIAFCPCDCPO
+     *
+ * * Protobuf type {@code ProudSkillExtraLevelNotify} */ public static final class Builder extends @@ -539,6 +557,10 @@ public Builder mergeFrom( private int talentIndex_ ; /** + * 
+       * 三个uint类型可能都不对
+       *
+ * * uint32 talent_index = 3; * @return The talentIndex. */ @@ -547,6 +569,10 @@ public int getTalentIndex() { return talentIndex_; } /** + * 
+       * 三个uint类型可能都不对
+       *
+ * * uint32 talent_index = 3; * @param value The talentIndex to set. * @return This builder for chaining. @@ -558,6 +584,10 @@ public Builder setTalentIndex(int value) { return this; } /** + * 
+       * 三个uint类型可能都不对
+       *
+ * * uint32 talent_index = 3; * @return This builder for chaining. */ diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityReqOuterClass.java index bad1d746894..4ceccd1d256 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityReqOuterClass.java @@ -19,42 +19,42 @@ public interface QuestCreateEntityReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 quest_id = 3; - * @return The questId. + * .CreateEntityInfo entity = 8; + * @return Whether the entity field is set. */ - int getQuestId(); - + boolean hasEntity(); /** - * uint32 parent_quest_id = 10; - * @return The parentQuestId. + * .CreateEntityInfo entity = 8; + * @return The entity. */ - int getParentQuestId(); + emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity(); + /** + * .CreateEntityInfo entity = 8; + */ + emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder(); /** - * bool is_rewind = 7; + * bool is_rewind = 6; * @return The isRewind. */ boolean getIsRewind(); /** - * .CreateEntityInfo entity = 4; - * @return Whether the entity field is set. - */ - boolean hasEntity(); - /** - * .CreateEntityInfo entity = 4; - * @return The entity. + * uint32 quest_id = 9; + * @return The questId. */ - emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity(); + int getQuestId(); + /** - * .CreateEntityInfo entity = 4; + * uint32 parent_quest_id = 14; + * @return The parentQuestId. */ - emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder(); + int getParentQuestId(); } /** * 
-   * CmdId: 8019
-   * Obf: DEHBJMMBJOK
+   * CmdId: 21882
+   * obf: AAFFHMOMCNF
    *
* * Protobuf type {@code QuestCreateEntityReq} @@ -101,12 +101,12 @@ private QuestCreateEntityReq( case 0: done = true; break; - case 24: { + case 48: { - questId_ = input.readUInt32(); + isRewind_ = input.readBool(); break; } - case 34: { + case 66: { emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder subBuilder = null; if (entity_ != null) { subBuilder = entity_.toBuilder(); @@ -119,12 +119,12 @@ private QuestCreateEntityReq( break; } - case 56: { + case 72: { - isRewind_ = input.readBool(); + questId_ = input.readUInt32(); break; } - case 80: { + case 112: { parentQuestId_ = input.readUInt32(); break; @@ -161,32 +161,36 @@ private QuestCreateEntityReq( emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq.class, emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq.Builder.class); } - public static final int QUEST_ID_FIELD_NUMBER = 3; - private int questId_; + public static final int ENTITY_FIELD_NUMBER = 8; + private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_; /** - * uint32 quest_id = 3; - * @return The questId. + * .CreateEntityInfo entity = 8; + * @return Whether the entity field is set. */ @java.lang.Override - public int getQuestId() { - return questId_; + public boolean hasEntity() { + return entity_ != null; } - - public static final int PARENT_QUEST_ID_FIELD_NUMBER = 10; - private int parentQuestId_; /** - * uint32 parent_quest_id = 10; - * @return The parentQuestId. + * .CreateEntityInfo entity = 8; + * @return The entity. */ @java.lang.Override - public int getParentQuestId() { - return parentQuestId_; + public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() { + return entity_ == null ? emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.getDefaultInstance() : entity_; + } + /** + * .CreateEntityInfo entity = 8; + */ + @java.lang.Override + public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() { + return getEntity(); } - public static final int IS_REWIND_FIELD_NUMBER = 7; + public static final int IS_REWIND_FIELD_NUMBER = 6; private boolean isRewind_; /** - * bool is_rewind = 7; + * bool is_rewind = 6; * @return The isRewind. */ @java.lang.Override @@ -194,30 +198,26 @@ public boolean getIsRewind() { return isRewind_; } - public static final int ENTITY_FIELD_NUMBER = 4; - private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_; - /** - * .CreateEntityInfo entity = 4; - * @return Whether the entity field is set. - */ - @java.lang.Override - public boolean hasEntity() { - return entity_ != null; - } + public static final int QUEST_ID_FIELD_NUMBER = 9; + private int questId_; /** - * .CreateEntityInfo entity = 4; - * @return The entity. + * uint32 quest_id = 9; + * @return The questId. */ @java.lang.Override - public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() { - return entity_ == null ? emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.getDefaultInstance() : entity_; + public int getQuestId() { + return questId_; } + + public static final int PARENT_QUEST_ID_FIELD_NUMBER = 14; + private int parentQuestId_; /** - * .CreateEntityInfo entity = 4; + * uint32 parent_quest_id = 14; + * @return The parentQuestId. */ @java.lang.Override - public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() { - return getEntity(); + public int getParentQuestId() { + return parentQuestId_; } private byte memoizedIsInitialized = -1; @@ -234,17 +234,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (questId_ != 0) { - output.writeUInt32(3, questId_); + if (isRewind_ != false) { + output.writeBool(6, isRewind_); } if (entity_ != null) { - output.writeMessage(4, getEntity()); + output.writeMessage(8, getEntity()); } - if (isRewind_ != false) { - output.writeBool(7, isRewind_); + if (questId_ != 0) { + output.writeUInt32(9, questId_); } if (parentQuestId_ != 0) { - output.writeUInt32(10, parentQuestId_); + output.writeUInt32(14, parentQuestId_); } unknownFields.writeTo(output); } @@ -255,21 +255,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (questId_ != 0) { + if (isRewind_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, questId_); + .computeBoolSize(6, isRewind_); } if (entity_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getEntity()); + .computeMessageSize(8, getEntity()); } - if (isRewind_ != false) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, isRewind_); + .computeUInt32Size(9, questId_); } if (parentQuestId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, parentQuestId_); + .computeUInt32Size(14, parentQuestId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -286,17 +286,17 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq other = (emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq) obj; - if (getQuestId() - != other.getQuestId()) return false; - if (getParentQuestId() - != other.getParentQuestId()) return false; - if (getIsRewind() - != other.getIsRewind()) return false; if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { if (!getEntity() .equals(other.getEntity())) return false; } + if (getIsRewind() + != other.getIsRewind()) return false; + if (getQuestId() + != other.getQuestId()) return false; + if (getParentQuestId() + != other.getParentQuestId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -308,17 +308,17 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; - hash = (53 * hash) + getQuestId(); - hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER; - hash = (53 * hash) + getParentQuestId(); - hash = (37 * hash) + IS_REWIND_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsRewind()); if (hasEntity()) { hash = (37 * hash) + ENTITY_FIELD_NUMBER; hash = (53 * hash) + getEntity().hashCode(); } + hash = (37 * hash) + IS_REWIND_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsRewind()); + hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; + hash = (53 * hash) + getQuestId(); + hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER; + hash = (53 * hash) + getParentQuestId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -416,8 +416,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 8019
-     * Obf: DEHBJMMBJOK
+     * CmdId: 21882
+     * obf: AAFFHMOMCNF
      *
* * Protobuf type {@code QuestCreateEntityReq} @@ -457,18 +457,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - questId_ = 0; - - parentQuestId_ = 0; - - isRewind_ = false; - if (entityBuilder_ == null) { entity_ = null; } else { entity_ = null; entityBuilder_ = null; } + isRewind_ = false; + + questId_ = 0; + + parentQuestId_ = 0; + return this; } @@ -495,14 +495,14 @@ public emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntit @java.lang.Override public emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq buildPartial() { emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq result = new emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq(this); - result.questId_ = questId_; - result.parentQuestId_ = parentQuestId_; - result.isRewind_ = isRewind_; if (entityBuilder_ == null) { result.entity_ = entity_; } else { result.entity_ = entityBuilder_.build(); } + result.isRewind_ = isRewind_; + result.questId_ = questId_; + result.parentQuestId_ = parentQuestId_; onBuilt(); return result; } @@ -551,18 +551,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq other) { if (other == emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntityReq.getDefaultInstance()) return this; + if (other.hasEntity()) { + mergeEntity(other.getEntity()); + } + if (other.getIsRewind() != false) { + setIsRewind(other.getIsRewind()); + } if (other.getQuestId() != 0) { setQuestId(other.getQuestId()); } if (other.getParentQuestId() != 0) { setParentQuestId(other.getParentQuestId()); } - if (other.getIsRewind() != false) { - setIsRewind(other.getIsRewind()); - } - if (other.hasEntity()) { - mergeEntity(other.getEntity()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -592,111 +592,18 @@ public Builder mergeFrom( return this; } - private int questId_ ; - /** - * uint32 quest_id = 3; - * @return The questId. - */ - @java.lang.Override - public int getQuestId() { - return questId_; - } - /** - * uint32 quest_id = 3; - * @param value The questId to set. - * @return This builder for chaining. - */ - public Builder setQuestId(int value) { - - questId_ = value; - onChanged(); - return this; - } - /** - * uint32 quest_id = 3; - * @return This builder for chaining. - */ - public Builder clearQuestId() { - - questId_ = 0; - onChanged(); - return this; - } - - private int parentQuestId_ ; - /** - * uint32 parent_quest_id = 10; - * @return The parentQuestId. - */ - @java.lang.Override - public int getParentQuestId() { - return parentQuestId_; - } - /** - * uint32 parent_quest_id = 10; - * @param value The parentQuestId to set. - * @return This builder for chaining. - */ - public Builder setParentQuestId(int value) { - - parentQuestId_ = value; - onChanged(); - return this; - } - /** - * uint32 parent_quest_id = 10; - * @return This builder for chaining. - */ - public Builder clearParentQuestId() { - - parentQuestId_ = 0; - onChanged(); - return this; - } - - private boolean isRewind_ ; - /** - * bool is_rewind = 7; - * @return The isRewind. - */ - @java.lang.Override - public boolean getIsRewind() { - return isRewind_; - } - /** - * bool is_rewind = 7; - * @param value The isRewind to set. - * @return This builder for chaining. - */ - public Builder setIsRewind(boolean value) { - - isRewind_ = value; - onChanged(); - return this; - } - /** - * bool is_rewind = 7; - * @return This builder for chaining. - */ - public Builder clearIsRewind() { - - isRewind_ = false; - onChanged(); - return this; - } - private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> entityBuilder_; /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; * @return Whether the entity field is set. */ public boolean hasEntity() { return entityBuilder_ != null || entity_ != null; } /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; * @return The entity. */ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() { @@ -707,7 +614,7 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo get } } /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; */ public Builder setEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) { if (entityBuilder_ == null) { @@ -723,7 +630,7 @@ public Builder setEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.Cr return this; } /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; */ public Builder setEntity( emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder builderForValue) { @@ -737,7 +644,7 @@ public Builder setEntity( return this; } /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; */ public Builder mergeEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) { if (entityBuilder_ == null) { @@ -755,7 +662,7 @@ public Builder mergeEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass. return this; } /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; */ public Builder clearEntity() { if (entityBuilder_ == null) { @@ -769,7 +676,7 @@ public Builder clearEntity() { return this; } /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; */ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder getEntityBuilder() { @@ -777,7 +684,7 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Bui return getEntityFieldBuilder().getBuilder(); } /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; */ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() { if (entityBuilder_ != null) { @@ -788,7 +695,7 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBu } } /** - * .CreateEntityInfo entity = 4; + * .CreateEntityInfo entity = 8; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> @@ -803,6 +710,99 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBu } return entityBuilder_; } + + private boolean isRewind_ ; + /** + * bool is_rewind = 6; + * @return The isRewind. + */ + @java.lang.Override + public boolean getIsRewind() { + return isRewind_; + } + /** + * bool is_rewind = 6; + * @param value The isRewind to set. + * @return This builder for chaining. + */ + public Builder setIsRewind(boolean value) { + + isRewind_ = value; + onChanged(); + return this; + } + /** + * bool is_rewind = 6; + * @return This builder for chaining. + */ + public Builder clearIsRewind() { + + isRewind_ = false; + onChanged(); + return this; + } + + private int questId_ ; + /** + * uint32 quest_id = 9; + * @return The questId. + */ + @java.lang.Override + public int getQuestId() { + return questId_; + } + /** + * uint32 quest_id = 9; + * @param value The questId to set. + * @return This builder for chaining. + */ + public Builder setQuestId(int value) { + + questId_ = value; + onChanged(); + return this; + } + /** + * uint32 quest_id = 9; + * @return This builder for chaining. + */ + public Builder clearQuestId() { + + questId_ = 0; + onChanged(); + return this; + } + + private int parentQuestId_ ; + /** + * uint32 parent_quest_id = 14; + * @return The parentQuestId. + */ + @java.lang.Override + public int getParentQuestId() { + return parentQuestId_; + } + /** + * uint32 parent_quest_id = 14; + * @param value The parentQuestId to set. + * @return This builder for chaining. + */ + public Builder setParentQuestId(int value) { + + parentQuestId_ = value; + onChanged(); + return this; + } + /** + * uint32 parent_quest_id = 14; + * @return This builder for chaining. + */ + public Builder clearParentQuestId() { + + parentQuestId_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -871,10 +871,10 @@ public emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntit static { java.lang.String[] descriptorData = { "\n\032QuestCreateEntityReq.proto\032\026CreateEnti" + - "tyInfo.proto\"w\n\024QuestCreateEntityReq\022\020\n\010" + - "quest_id\030\003 \001(\r\022\027\n\017parent_quest_id\030\n \001(\r\022" + - "\021\n\tis_rewind\030\007 \001(\010\022!\n\006entity\030\004 \001(\0132\021.Cre" + - "ateEntityInfoB\033\n\031emu.grasscutter.net.pro" + + "tyInfo.proto\"w\n\024QuestCreateEntityReq\022!\n\006" + + "entity\030\010 \001(\0132\021.CreateEntityInfo\022\021\n\tis_re" + + "wind\030\006 \001(\010\022\020\n\010quest_id\030\t \001(\r\022\027\n\017parent_q" + + "uest_id\030\016 \001(\rB\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -887,7 +887,7 @@ public emu.grasscutter.net.proto.QuestCreateEntityReqOuterClass.QuestCreateEntit internal_static_QuestCreateEntityReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QuestCreateEntityReq_descriptor, - new java.lang.String[] { "QuestId", "ParentQuestId", "IsRewind", "Entity", }); + new java.lang.String[] { "Entity", "IsRewind", "QuestId", "ParentQuestId", }); emu.grasscutter.net.proto.CreateEntityInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityRspOuterClass.java index 2d8d53f4a1f..dfb4315ea02 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestCreateEntityRspOuterClass.java @@ -19,54 +19,54 @@ public interface QuestCreateEntityRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 entity_id = 8; - * @return The entityId. + * uint32 parent_quest_id = 2; + * @return The parentQuestId. */ - int getEntityId(); + int getParentQuestId(); /** - * uint32 quest_id = 12; - * @return The questId. + * bool is_rewind = 3; + * @return The isRewind. */ - int getQuestId(); + boolean getIsRewind(); /** - * bool is_rewind = 7; - * @return The isRewind. + * uint32 entity_id = 5; + * @return The entityId. */ - boolean getIsRewind(); + int getEntityId(); /** - * uint32 parent_quest_id = 11; - * @return The parentQuestId. + * uint32 quest_id = 11; + * @return The questId. */ - int getParentQuestId(); + int getQuestId(); /** - * int32 retcode = 15; + * int32 retcode = 14; * @return The retcode. */ int getRetcode(); /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; * @return Whether the entity field is set. */ boolean hasEntity(); /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; * @return The entity. */ emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity(); /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder(); } /** * 
-   * CmdId: 4869
-   * Obf: CPPCDDEOKGP
+   * CmdId: 8838
+   * obf: LDBFNDJEBLI
    *
* * Protobuf type {@code QuestCreateEntityRsp} @@ -113,17 +113,32 @@ private QuestCreateEntityRsp( case 0: done = true; break; - case 56: { + case 16: { + + parentQuestId_ = input.readUInt32(); + break; + } + case 24: { isRewind_ = input.readBool(); break; } - case 64: { + case 40: { entityId_ = input.readUInt32(); break; } - case 74: { + case 88: { + + questId_ = input.readUInt32(); + break; + } + case 112: { + + retcode_ = input.readInt32(); + break; + } + case 122: { emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder subBuilder = null; if (entity_ != null) { subBuilder = entity_.toBuilder(); @@ -136,21 +151,6 @@ private QuestCreateEntityRsp( break; } - case 88: { - - parentQuestId_ = input.readUInt32(); - break; - } - case 96: { - - questId_ = input.readUInt32(); - break; - } - case 120: { - - retcode_ = input.readInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -183,54 +183,54 @@ private QuestCreateEntityRsp( emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp.class, emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp.Builder.class); } - public static final int ENTITY_ID_FIELD_NUMBER = 8; - private int entityId_; + public static final int PARENT_QUEST_ID_FIELD_NUMBER = 2; + private int parentQuestId_; /** - * uint32 entity_id = 8; - * @return The entityId. + * uint32 parent_quest_id = 2; + * @return The parentQuestId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getParentQuestId() { + return parentQuestId_; } - public static final int QUEST_ID_FIELD_NUMBER = 12; - private int questId_; + public static final int IS_REWIND_FIELD_NUMBER = 3; + private boolean isRewind_; /** - * uint32 quest_id = 12; - * @return The questId. + * bool is_rewind = 3; + * @return The isRewind. */ @java.lang.Override - public int getQuestId() { - return questId_; + public boolean getIsRewind() { + return isRewind_; } - public static final int IS_REWIND_FIELD_NUMBER = 7; - private boolean isRewind_; + public static final int ENTITY_ID_FIELD_NUMBER = 5; + private int entityId_; /** - * bool is_rewind = 7; - * @return The isRewind. + * uint32 entity_id = 5; + * @return The entityId. */ @java.lang.Override - public boolean getIsRewind() { - return isRewind_; + public int getEntityId() { + return entityId_; } - public static final int PARENT_QUEST_ID_FIELD_NUMBER = 11; - private int parentQuestId_; + public static final int QUEST_ID_FIELD_NUMBER = 11; + private int questId_; /** - * uint32 parent_quest_id = 11; - * @return The parentQuestId. + * uint32 quest_id = 11; + * @return The questId. */ @java.lang.Override - public int getParentQuestId() { - return parentQuestId_; + public int getQuestId() { + return questId_; } - public static final int RETCODE_FIELD_NUMBER = 15; + public static final int RETCODE_FIELD_NUMBER = 14; private int retcode_; /** - * int32 retcode = 15; + * int32 retcode = 14; * @return The retcode. */ @java.lang.Override @@ -238,10 +238,10 @@ public int getRetcode() { return retcode_; } - public static final int ENTITY_FIELD_NUMBER = 9; + public static final int ENTITY_FIELD_NUMBER = 15; private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_; /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; * @return Whether the entity field is set. */ @java.lang.Override @@ -249,7 +249,7 @@ public boolean hasEntity() { return entity_ != null; } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; * @return The entity. */ @java.lang.Override @@ -257,7 +257,7 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo get return entity_ == null ? emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.getDefaultInstance() : entity_; } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ @java.lang.Override public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() { @@ -278,23 +278,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (parentQuestId_ != 0) { + output.writeUInt32(2, parentQuestId_); + } if (isRewind_ != false) { - output.writeBool(7, isRewind_); + output.writeBool(3, isRewind_); } if (entityId_ != 0) { - output.writeUInt32(8, entityId_); - } - if (entity_ != null) { - output.writeMessage(9, getEntity()); - } - if (parentQuestId_ != 0) { - output.writeUInt32(11, parentQuestId_); + output.writeUInt32(5, entityId_); } if (questId_ != 0) { - output.writeUInt32(12, questId_); + output.writeUInt32(11, questId_); } if (retcode_ != 0) { - output.writeInt32(15, retcode_); + output.writeInt32(14, retcode_); + } + if (entity_ != null) { + output.writeMessage(15, getEntity()); } unknownFields.writeTo(output); } @@ -305,29 +305,29 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (isRewind_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, isRewind_); - } - if (entityId_ != 0) { + if (parentQuestId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, entityId_); + .computeUInt32Size(2, parentQuestId_); } - if (entity_ != null) { + if (isRewind_ != false) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, getEntity()); + .computeBoolSize(3, isRewind_); } - if (parentQuestId_ != 0) { + if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, parentQuestId_); + .computeUInt32Size(5, entityId_); } if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, questId_); + .computeUInt32Size(11, questId_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(15, retcode_); + .computeInt32Size(14, retcode_); + } + if (entity_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(15, getEntity()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -344,14 +344,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp other = (emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp) obj; + if (getParentQuestId() + != other.getParentQuestId()) return false; + if (getIsRewind() + != other.getIsRewind()) return false; if (getEntityId() != other.getEntityId()) return false; if (getQuestId() != other.getQuestId()) return false; - if (getIsRewind() - != other.getIsRewind()) return false; - if (getParentQuestId() - != other.getParentQuestId()) return false; if (getRetcode() != other.getRetcode()) return false; if (hasEntity() != other.hasEntity()) return false; @@ -370,15 +370,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER; + hash = (53 * hash) + getParentQuestId(); + hash = (37 * hash) + IS_REWIND_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsRewind()); hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; hash = (53 * hash) + getEntityId(); hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; hash = (53 * hash) + getQuestId(); - hash = (37 * hash) + IS_REWIND_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsRewind()); - hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER; - hash = (53 * hash) + getParentQuestId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); if (hasEntity()) { @@ -482,8 +482,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 4869
-     * Obf: CPPCDDEOKGP
+     * CmdId: 8838
+     * obf: LDBFNDJEBLI
      *
* * Protobuf type {@code QuestCreateEntityRsp} @@ -523,13 +523,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - entityId_ = 0; - - questId_ = 0; + parentQuestId_ = 0; isRewind_ = false; - parentQuestId_ = 0; + entityId_ = 0; + + questId_ = 0; retcode_ = 0; @@ -565,10 +565,10 @@ public emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntit @java.lang.Override public emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp buildPartial() { emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp result = new emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp(this); + result.parentQuestId_ = parentQuestId_; + result.isRewind_ = isRewind_; result.entityId_ = entityId_; result.questId_ = questId_; - result.isRewind_ = isRewind_; - result.parentQuestId_ = parentQuestId_; result.retcode_ = retcode_; if (entityBuilder_ == null) { result.entity_ = entity_; @@ -623,18 +623,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp other) { if (other == emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntityRsp.getDefaultInstance()) return this; + if (other.getParentQuestId() != 0) { + setParentQuestId(other.getParentQuestId()); + } + if (other.getIsRewind() != false) { + setIsRewind(other.getIsRewind()); + } if (other.getEntityId() != 0) { setEntityId(other.getEntityId()); } if (other.getQuestId() != 0) { setQuestId(other.getQuestId()); } - if (other.getIsRewind() != false) { - setIsRewind(other.getIsRewind()); - } - if (other.getParentQuestId() != 0) { - setParentQuestId(other.getParentQuestId()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } @@ -670,133 +670,133 @@ public Builder mergeFrom( return this; } - private int entityId_ ; + private int parentQuestId_ ; /** - * uint32 entity_id = 8; - * @return The entityId. + * uint32 parent_quest_id = 2; + * @return The parentQuestId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getParentQuestId() { + return parentQuestId_; } /** - * uint32 entity_id = 8; - * @param value The entityId to set. + * uint32 parent_quest_id = 2; + * @param value The parentQuestId to set. * @return This builder for chaining. */ - public Builder setEntityId(int value) { + public Builder setParentQuestId(int value) { - entityId_ = value; + parentQuestId_ = value; onChanged(); return this; } /** - * uint32 entity_id = 8; + * uint32 parent_quest_id = 2; * @return This builder for chaining. */ - public Builder clearEntityId() { + public Builder clearParentQuestId() { - entityId_ = 0; + parentQuestId_ = 0; onChanged(); return this; } - private int questId_ ; + private boolean isRewind_ ; /** - * uint32 quest_id = 12; - * @return The questId. + * bool is_rewind = 3; + * @return The isRewind. */ @java.lang.Override - public int getQuestId() { - return questId_; + public boolean getIsRewind() { + return isRewind_; } /** - * uint32 quest_id = 12; - * @param value The questId to set. + * bool is_rewind = 3; + * @param value The isRewind to set. * @return This builder for chaining. */ - public Builder setQuestId(int value) { + public Builder setIsRewind(boolean value) { - questId_ = value; + isRewind_ = value; onChanged(); return this; } /** - * uint32 quest_id = 12; + * bool is_rewind = 3; * @return This builder for chaining. */ - public Builder clearQuestId() { + public Builder clearIsRewind() { - questId_ = 0; + isRewind_ = false; onChanged(); return this; } - private boolean isRewind_ ; + private int entityId_ ; /** - * bool is_rewind = 7; - * @return The isRewind. + * uint32 entity_id = 5; + * @return The entityId. */ @java.lang.Override - public boolean getIsRewind() { - return isRewind_; + public int getEntityId() { + return entityId_; } /** - * bool is_rewind = 7; - * @param value The isRewind to set. + * uint32 entity_id = 5; + * @param value The entityId to set. * @return This builder for chaining. */ - public Builder setIsRewind(boolean value) { + public Builder setEntityId(int value) { - isRewind_ = value; + entityId_ = value; onChanged(); return this; } /** - * bool is_rewind = 7; + * uint32 entity_id = 5; * @return This builder for chaining. */ - public Builder clearIsRewind() { + public Builder clearEntityId() { - isRewind_ = false; + entityId_ = 0; onChanged(); return this; } - private int parentQuestId_ ; + private int questId_ ; /** - * uint32 parent_quest_id = 11; - * @return The parentQuestId. + * uint32 quest_id = 11; + * @return The questId. */ @java.lang.Override - public int getParentQuestId() { - return parentQuestId_; + public int getQuestId() { + return questId_; } /** - * uint32 parent_quest_id = 11; - * @param value The parentQuestId to set. + * uint32 quest_id = 11; + * @param value The questId to set. * @return This builder for chaining. */ - public Builder setParentQuestId(int value) { + public Builder setQuestId(int value) { - parentQuestId_ = value; + questId_ = value; onChanged(); return this; } /** - * uint32 parent_quest_id = 11; + * uint32 quest_id = 11; * @return This builder for chaining. */ - public Builder clearParentQuestId() { + public Builder clearQuestId() { - parentQuestId_ = 0; + questId_ = 0; onChanged(); return this; } private int retcode_ ; /** - * int32 retcode = 15; + * int32 retcode = 14; * @return The retcode. */ @java.lang.Override @@ -804,7 +804,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 15; + * int32 retcode = 14; * @param value The retcode to set. * @return This builder for chaining. */ @@ -815,7 +815,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 15; + * int32 retcode = 14; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -829,14 +829,14 @@ public Builder clearRetcode() { private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> entityBuilder_; /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; * @return Whether the entity field is set. */ public boolean hasEntity() { return entityBuilder_ != null || entity_ != null; } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; * @return The entity. */ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() { @@ -847,7 +847,7 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo get } } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ public Builder setEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) { if (entityBuilder_ == null) { @@ -863,7 +863,7 @@ public Builder setEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.Cr return this; } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ public Builder setEntity( emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder builderForValue) { @@ -877,7 +877,7 @@ public Builder setEntity( return this; } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ public Builder mergeEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) { if (entityBuilder_ == null) { @@ -895,7 +895,7 @@ public Builder mergeEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass. return this; } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ public Builder clearEntity() { if (entityBuilder_ == null) { @@ -909,7 +909,7 @@ public Builder clearEntity() { return this; } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder getEntityBuilder() { @@ -917,7 +917,7 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Bui return getEntityFieldBuilder().getBuilder(); } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() { if (entityBuilder_ != null) { @@ -928,7 +928,7 @@ public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBu } } /** - * .CreateEntityInfo entity = 9; + * .CreateEntityInfo entity = 15; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> @@ -1011,10 +1011,10 @@ public emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntit static { java.lang.String[] descriptorData = { "\n\032QuestCreateEntityRsp.proto\032\026CreateEnti" + - "tyInfo.proto\"\233\001\n\024QuestCreateEntityRsp\022\021\n" + - "\tentity_id\030\010 \001(\r\022\020\n\010quest_id\030\014 \001(\r\022\021\n\tis" + - "_rewind\030\007 \001(\010\022\027\n\017parent_quest_id\030\013 \001(\r\022\017" + - "\n\007retcode\030\017 \001(\005\022!\n\006entity\030\t \001(\0132\021.Create" + + "tyInfo.proto\"\233\001\n\024QuestCreateEntityRsp\022\027\n" + + "\017parent_quest_id\030\002 \001(\r\022\021\n\tis_rewind\030\003 \001(" + + "\010\022\021\n\tentity_id\030\005 \001(\r\022\020\n\010quest_id\030\013 \001(\r\022\017" + + "\n\007retcode\030\016 \001(\005\022!\n\006entity\030\017 \001(\0132\021.Create" + "EntityInfoB\033\n\031emu.grasscutter.net.protob" + "\006proto3" }; @@ -1028,7 +1028,7 @@ public emu.grasscutter.net.proto.QuestCreateEntityRspOuterClass.QuestCreateEntit internal_static_QuestCreateEntityRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QuestCreateEntityRsp_descriptor, - new java.lang.String[] { "EntityId", "QuestId", "IsRewind", "ParentQuestId", "Retcode", "Entity", }); + new java.lang.String[] { "ParentQuestId", "IsRewind", "EntityId", "QuestId", "Retcode", "Entity", }); emu.grasscutter.net.proto.CreateEntityInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestDelNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestDelNotifyOuterClass.java index 803ccfda0e2..21af4abac0b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestDelNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestDelNotifyOuterClass.java @@ -19,15 +19,15 @@ public interface QuestDelNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 quest_id = 9; + * uint32 quest_id = 4; * @return The questId. */ int getQuestId(); } /** * 
-   * CmdId: 29185
-   * Obf: JJCKCDINJAJ
+   * CmdId: 1774
+   * obf: MMDDENPGBJG
    *
* * Protobuf type {@code QuestDelNotify} @@ -74,7 +74,7 @@ private QuestDelNotify( case 0: done = true; break; - case 72: { + case 32: { questId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ private QuestDelNotify( emu.grasscutter.net.proto.QuestDelNotifyOuterClass.QuestDelNotify.class, emu.grasscutter.net.proto.QuestDelNotifyOuterClass.QuestDelNotify.Builder.class); } - public static final int QUEST_ID_FIELD_NUMBER = 9; + public static final int QUEST_ID_FIELD_NUMBER = 4; private int questId_; /** - * uint32 quest_id = 9; + * uint32 quest_id = 4; * @return The questId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (questId_ != 0) { - output.writeUInt32(9, questId_); + output.writeUInt32(4, questId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, questId_); + .computeUInt32Size(4, questId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29185
-     * Obf: JJCKCDINJAJ
+     * CmdId: 1774
+     * obf: MMDDENPGBJG
      *
* * Protobuf type {@code QuestDelNotify} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int questId_ ; /** - * uint32 quest_id = 9; + * uint32 quest_id = 4; * @return The questId. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getQuestId() { return questId_; } /** - * uint32 quest_id = 9; + * uint32 quest_id = 4; * @param value The questId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setQuestId(int value) { return this; } /** - * uint32 quest_id = 9; + * uint32 quest_id = 4; * @return This builder for chaining. */ public Builder clearQuestId() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.QuestDelNotifyOuterClass.QuestDelNotify getDefa static { java.lang.String[] descriptorData = { "\n\024QuestDelNotify.proto\"\"\n\016QuestDelNotify" + - "\022\020\n\010quest_id\030\t \001(\rB\033\n\031emu.grasscutter.ne" + + "\022\020\n\010quest_id\030\004 \001(\rB\033\n\031emu.grasscutter.ne" + "t.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyEntityReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyEntityReqOuterClass.java index 6103f4acd78..2356e12ac00 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyEntityReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyEntityReqOuterClass.java @@ -19,27 +19,27 @@ public interface QuestDestroyEntityReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 entity_id = 1; - * @return The entityId. + * uint32 quest_id = 3; + * @return The questId. */ - int getEntityId(); + int getQuestId(); /** - * uint32 scene_id = 14; + * uint32 scene_id = 11; * @return The sceneId. */ int getSceneId(); /** - * uint32 quest_id = 6; - * @return The questId. + * uint32 entity_id = 5; + * @return The entityId. */ - int getQuestId(); + int getEntityId(); } /** * 
-   * CmdId: 21308
-   * Obf: FFHMLGIIJEI
+   * CmdId: 25911
+   * obf: GMIAEABDHEG
    *
* * Protobuf type {@code QuestDestroyEntityReq} @@ -86,17 +86,17 @@ private QuestDestroyEntityReq( case 0: done = true; break; - case 8: { + case 24: { - entityId_ = input.readUInt32(); + questId_ = input.readUInt32(); break; } - case 48: { + case 40: { - questId_ = input.readUInt32(); + entityId_ = input.readUInt32(); break; } - case 112: { + case 88: { sceneId_ = input.readUInt32(); break; @@ -133,21 +133,21 @@ private QuestDestroyEntityReq( emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq.class, emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq.Builder.class); } - public static final int ENTITY_ID_FIELD_NUMBER = 1; - private int entityId_; + public static final int QUEST_ID_FIELD_NUMBER = 3; + private int questId_; /** - * uint32 entity_id = 1; - * @return The entityId. + * uint32 quest_id = 3; + * @return The questId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getQuestId() { + return questId_; } - public static final int SCENE_ID_FIELD_NUMBER = 14; + public static final int SCENE_ID_FIELD_NUMBER = 11; private int sceneId_; /** - * uint32 scene_id = 14; + * uint32 scene_id = 11; * @return The sceneId. */ @java.lang.Override @@ -155,15 +155,15 @@ public int getSceneId() { return sceneId_; } - public static final int QUEST_ID_FIELD_NUMBER = 6; - private int questId_; + public static final int ENTITY_ID_FIELD_NUMBER = 5; + private int entityId_; /** - * uint32 quest_id = 6; - * @return The questId. + * uint32 entity_id = 5; + * @return The entityId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getEntityId() { + return entityId_; } private byte memoizedIsInitialized = -1; @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (entityId_ != 0) { - output.writeUInt32(1, entityId_); - } if (questId_ != 0) { - output.writeUInt32(6, questId_); + output.writeUInt32(3, questId_); + } + if (entityId_ != 0) { + output.writeUInt32(5, entityId_); } if (sceneId_ != 0) { - output.writeUInt32(14, sceneId_); + output.writeUInt32(11, sceneId_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (entityId_ != 0) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, entityId_); + .computeUInt32Size(3, questId_); } - if (questId_ != 0) { + if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, questId_); + .computeUInt32Size(5, entityId_); } if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, sceneId_); + .computeUInt32Size(11, sceneId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +225,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq other = (emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq) obj; - if (getEntityId() - != other.getEntityId()) return false; - if (getSceneId() - != other.getSceneId()) return false; if (getQuestId() != other.getQuestId()) return false; + if (getSceneId() + != other.getSceneId()) return false; + if (getEntityId() + != other.getEntityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +242,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); - hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; - hash = (53 * hash) + getSceneId(); hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; hash = (53 * hash) + getQuestId(); + hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSceneId(); + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 21308
-     * Obf: FFHMLGIIJEI
+     * CmdId: 25911
+     * obf: GMIAEABDHEG
      *
* * Protobuf type {@code QuestDestroyEntityReq} @@ -386,11 +386,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - entityId_ = 0; + questId_ = 0; sceneId_ = 0; - questId_ = 0; + entityId_ = 0; return this; } @@ -418,9 +418,9 @@ public emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEnt @java.lang.Override public emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq buildPartial() { emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq result = new emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq(this); - result.entityId_ = entityId_; - result.sceneId_ = sceneId_; result.questId_ = questId_; + result.sceneId_ = sceneId_; + result.entityId_ = entityId_; onBuilt(); return result; } @@ -469,14 +469,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq other) { if (other == emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEntityReq.getDefaultInstance()) return this; - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); + if (other.getQuestId() != 0) { + setQuestId(other.getQuestId()); } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } - if (other.getQuestId() != 0) { - setQuestId(other.getQuestId()); + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -507,40 +507,40 @@ public Builder mergeFrom( return this; } - private int entityId_ ; + private int questId_ ; /** - * uint32 entity_id = 1; - * @return The entityId. + * uint32 quest_id = 3; + * @return The questId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getQuestId() { + return questId_; } /** - * uint32 entity_id = 1; - * @param value The entityId to set. + * uint32 quest_id = 3; + * @param value The questId to set. * @return This builder for chaining. */ - public Builder setEntityId(int value) { + public Builder setQuestId(int value) { - entityId_ = value; + questId_ = value; onChanged(); return this; } /** - * uint32 entity_id = 1; + * uint32 quest_id = 3; * @return This builder for chaining. */ - public Builder clearEntityId() { + public Builder clearQuestId() { - entityId_ = 0; + questId_ = 0; onChanged(); return this; } private int sceneId_ ; /** - * uint32 scene_id = 14; + * uint32 scene_id = 11; * @return The sceneId. */ @java.lang.Override @@ -548,7 +548,7 @@ public int getSceneId() { return sceneId_; } /** - * uint32 scene_id = 14; + * uint32 scene_id = 11; * @param value The sceneId to set. * @return This builder for chaining. */ @@ -559,7 +559,7 @@ public Builder setSceneId(int value) { return this; } /** - * uint32 scene_id = 14; + * uint32 scene_id = 11; * @return This builder for chaining. */ public Builder clearSceneId() { @@ -569,33 +569,33 @@ public Builder clearSceneId() { return this; } - private int questId_ ; + private int entityId_ ; /** - * uint32 quest_id = 6; - * @return The questId. + * uint32 entity_id = 5; + * @return The entityId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getEntityId() { + return entityId_; } /** - * uint32 quest_id = 6; - * @param value The questId to set. + * uint32 entity_id = 5; + * @param value The entityId to set. * @return This builder for chaining. */ - public Builder setQuestId(int value) { + public Builder setEntityId(int value) { - questId_ = value; + entityId_ = value; onChanged(); return this; } /** - * uint32 quest_id = 6; + * uint32 entity_id = 5; * @return This builder for chaining. */ - public Builder clearQuestId() { + public Builder clearEntityId() { - questId_ = 0; + entityId_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEnt static { java.lang.String[] descriptorData = { "\n\033QuestDestroyEntityReq.proto\"N\n\025QuestDe" + - "stroyEntityReq\022\021\n\tentity_id\030\001 \001(\r\022\020\n\010sce" + - "ne_id\030\016 \001(\r\022\020\n\010quest_id\030\006 \001(\rB\033\n\031emu.gra" + + "stroyEntityReq\022\020\n\010quest_id\030\003 \001(\r\022\020\n\010scen" + + "e_id\030\013 \001(\r\022\021\n\tentity_id\030\005 \001(\rB\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.QuestDestroyEntityReqOuterClass.QuestDestroyEnt internal_static_QuestDestroyEntityReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QuestDestroyEntityReq_descriptor, - new java.lang.String[] { "EntityId", "SceneId", "QuestId", }); + new java.lang.String[] { "QuestId", "SceneId", "EntityId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyEntityRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyEntityRspOuterClass.java index 142599b4585..66ad95f8bdd 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyEntityRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyEntityRspOuterClass.java @@ -19,16 +19,10 @@ public interface QuestDestroyEntityRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 scene_id = 14; - * @return The sceneId. - */ - int getSceneId(); - - /** - * int32 retcode = 7; - * @return The retcode. + * uint32 quest_id = 1; + * @return The questId. */ - int getRetcode(); + int getQuestId(); /** * uint32 entity_id = 3; @@ -37,15 +31,21 @@ public interface QuestDestroyEntityRspOrBuilder extends int getEntityId(); /** - * uint32 quest_id = 10; - * @return The questId. + * uint32 scene_id = 6; + * @return The sceneId. */ - int getQuestId(); + int getSceneId(); + + /** + * int32 retcode = 11; + * @return The retcode. + */ + int getRetcode(); } /** * 
-   * CmdId: 9130
-   * Obf: FGDKHKLDGLI
+   * CmdId: 3908
+   * obf: IDMDPJLMEGL
    *
* * Protobuf type {@code QuestDestroyEntityRsp} @@ -92,24 +92,24 @@ private QuestDestroyEntityRsp( case 0: done = true; break; - case 24: { + case 8: { - entityId_ = input.readUInt32(); + questId_ = input.readUInt32(); break; } - case 56: { + case 24: { - retcode_ = input.readInt32(); + entityId_ = input.readUInt32(); break; } - case 80: { + case 48: { - questId_ = input.readUInt32(); + sceneId_ = input.readUInt32(); break; } - case 112: { + case 88: { - sceneId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } default: { @@ -144,26 +144,15 @@ private QuestDestroyEntityRsp( emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp.class, emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp.Builder.class); } - public static final int SCENE_ID_FIELD_NUMBER = 14; - private int sceneId_; - /** - * uint32 scene_id = 14; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - - public static final int RETCODE_FIELD_NUMBER = 7; - private int retcode_; + public static final int QUEST_ID_FIELD_NUMBER = 1; + private int questId_; /** - * int32 retcode = 7; - * @return The retcode. + * uint32 quest_id = 1; + * @return The questId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getQuestId() { + return questId_; } public static final int ENTITY_ID_FIELD_NUMBER = 3; @@ -177,15 +166,26 @@ public int getEntityId() { return entityId_; } - public static final int QUEST_ID_FIELD_NUMBER = 10; - private int questId_; + public static final int SCENE_ID_FIELD_NUMBER = 6; + private int sceneId_; /** - * uint32 quest_id = 10; - * @return The questId. + * uint32 scene_id = 6; + * @return The sceneId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getSceneId() { + return sceneId_; + } + + public static final int RETCODE_FIELD_NUMBER = 11; + private int retcode_; + /** + * int32 retcode = 11; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; } private byte memoizedIsInitialized = -1; @@ -202,17 +202,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (questId_ != 0) { + output.writeUInt32(1, questId_); + } if (entityId_ != 0) { output.writeUInt32(3, entityId_); } - if (retcode_ != 0) { - output.writeInt32(7, retcode_); - } - if (questId_ != 0) { - output.writeUInt32(10, questId_); - } if (sceneId_ != 0) { - output.writeUInt32(14, sceneId_); + output.writeUInt32(6, sceneId_); + } + if (retcode_ != 0) { + output.writeInt32(11, retcode_); } unknownFields.writeTo(output); } @@ -223,21 +223,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (entityId_ != 0) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, entityId_); + .computeUInt32Size(1, questId_); } - if (retcode_ != 0) { + if (entityId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(7, retcode_); + .computeUInt32Size(3, entityId_); } - if (questId_ != 0) { + if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, questId_); + .computeUInt32Size(6, sceneId_); } - if (sceneId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, sceneId_); + .computeInt32Size(11, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -254,14 +254,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp other = (emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp) obj; + if (getQuestId() + != other.getQuestId()) return false; + if (getEntityId() + != other.getEntityId()) return false; if (getSceneId() != other.getSceneId()) return false; if (getRetcode() != other.getRetcode()) return false; - if (getEntityId() - != other.getEntityId()) return false; - if (getQuestId() - != other.getQuestId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -273,14 +273,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; + hash = (53 * hash) + getQuestId(); + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; hash = (53 * hash) + getSceneId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); - hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; - hash = (53 * hash) + getQuestId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -378,8 +378,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 9130
-     * Obf: FGDKHKLDGLI
+     * CmdId: 3908
+     * obf: IDMDPJLMEGL
      *
* * Protobuf type {@code QuestDestroyEntityRsp} @@ -419,13 +419,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - sceneId_ = 0; - - retcode_ = 0; + questId_ = 0; entityId_ = 0; - questId_ = 0; + sceneId_ = 0; + + retcode_ = 0; return this; } @@ -453,10 +453,10 @@ public emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEnt @java.lang.Override public emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp buildPartial() { emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp result = new emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp(this); + result.questId_ = questId_; + result.entityId_ = entityId_; result.sceneId_ = sceneId_; result.retcode_ = retcode_; - result.entityId_ = entityId_; - result.questId_ = questId_; onBuilt(); return result; } @@ -505,18 +505,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp other) { if (other == emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEntityRsp.getDefaultInstance()) return this; + if (other.getQuestId() != 0) { + setQuestId(other.getQuestId()); + } + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); + } if (other.getSceneId() != 0) { setSceneId(other.getSceneId()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); - } - if (other.getQuestId() != 0) { - setQuestId(other.getQuestId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -546,126 +546,126 @@ public Builder mergeFrom( return this; } - private int sceneId_ ; + private int questId_ ; /** - * uint32 scene_id = 14; - * @return The sceneId. + * uint32 quest_id = 1; + * @return The questId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getQuestId() { + return questId_; } /** - * uint32 scene_id = 14; - * @param value The sceneId to set. + * uint32 quest_id = 1; + * @param value The questId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setQuestId(int value) { - sceneId_ = value; + questId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 14; + * uint32 quest_id = 1; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearQuestId() { - sceneId_ = 0; + questId_ = 0; onChanged(); return this; } - private int retcode_ ; + private int entityId_ ; /** - * int32 retcode = 7; - * @return The retcode. + * uint32 entity_id = 3; + * @return The entityId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getEntityId() { + return entityId_; } /** - * int32 retcode = 7; - * @param value The retcode to set. + * uint32 entity_id = 3; + * @param value The entityId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setEntityId(int value) { - retcode_ = value; + entityId_ = value; onChanged(); return this; } /** - * int32 retcode = 7; + * uint32 entity_id = 3; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearEntityId() { - retcode_ = 0; + entityId_ = 0; onChanged(); return this; } - private int entityId_ ; + private int sceneId_ ; /** - * uint32 entity_id = 3; - * @return The entityId. + * uint32 scene_id = 6; + * @return The sceneId. */ @java.lang.Override - public int getEntityId() { - return entityId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 entity_id = 3; - * @param value The entityId to set. + * uint32 scene_id = 6; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setEntityId(int value) { + public Builder setSceneId(int value) { - entityId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 entity_id = 3; + * uint32 scene_id = 6; * @return This builder for chaining. */ - public Builder clearEntityId() { + public Builder clearSceneId() { - entityId_ = 0; + sceneId_ = 0; onChanged(); return this; } - private int questId_ ; + private int retcode_ ; /** - * uint32 quest_id = 10; - * @return The questId. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getRetcode() { + return retcode_; } /** - * uint32 quest_id = 10; - * @param value The questId to set. + * int32 retcode = 11; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setQuestId(int value) { + public Builder setRetcode(int value) { - questId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 quest_id = 10; + * int32 retcode = 11; * @return This builder for chaining. */ - public Builder clearQuestId() { + public Builder clearRetcode() { - questId_ = 0; + retcode_ = 0; onChanged(); return this; } @@ -737,9 +737,9 @@ public emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEnt static { java.lang.String[] descriptorData = { "\n\033QuestDestroyEntityRsp.proto\"_\n\025QuestDe" + - "stroyEntityRsp\022\020\n\010scene_id\030\016 \001(\r\022\017\n\007retc" + - "ode\030\007 \001(\005\022\021\n\tentity_id\030\003 \001(\r\022\020\n\010quest_id" + - "\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + + "stroyEntityRsp\022\020\n\010quest_id\030\001 \001(\r\022\021\n\tenti" + + "ty_id\030\003 \001(\r\022\020\n\010scene_id\030\006 \001(\r\022\017\n\007retcode" + + "\030\013 \001(\005B\033\n\031emu.grasscutter.net.protob\006pro" + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -751,7 +751,7 @@ public emu.grasscutter.net.proto.QuestDestroyEntityRspOuterClass.QuestDestroyEnt internal_static_QuestDestroyEntityRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QuestDestroyEntityRsp_descriptor, - new java.lang.String[] { "SceneId", "Retcode", "EntityId", "QuestId", }); + new java.lang.String[] { "QuestId", "EntityId", "SceneId", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestGlobalVarNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestGlobalVarNotifyOuterClass.java index 3c58907207e..659882bc136 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestGlobalVarNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestGlobalVarNotifyOuterClass.java @@ -19,33 +19,33 @@ public interface QuestGlobalVarNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ java.util.List getVarListList(); /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar getVarList(int index); /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ int getVarListCount(); /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ java.util.List getVarListOrBuilderList(); /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVarOrBuilder getVarListOrBuilder( int index); } /** * 
-   * CmdId: 23502
-   * Obf: JGINEENLNCF
+   * CmdId: 26464
+   * obf: JNNODCLPIDE
    *
* * Protobuf type {@code QuestGlobalVarNotify} @@ -94,7 +94,7 @@ private QuestGlobalVarNotify( case 0: done = true; break; - case 10: { + case 26: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { varList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -138,17 +138,17 @@ private QuestGlobalVarNotify( emu.grasscutter.net.proto.QuestGlobalVarNotifyOuterClass.QuestGlobalVarNotify.class, emu.grasscutter.net.proto.QuestGlobalVarNotifyOuterClass.QuestGlobalVarNotify.Builder.class); } - public static final int VAR_LIST_FIELD_NUMBER = 1; + public static final int VAR_LIST_FIELD_NUMBER = 3; private java.util.List varList_; /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ @java.lang.Override public java.util.List getVarListList() { return varList_; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ @java.lang.Override public java.util.List @@ -156,21 +156,21 @@ public java.util.Listrepeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ @java.lang.Override public int getVarListCount() { return varList_.size(); } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ @java.lang.Override public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar getVarList(int index) { return varList_.get(index); } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ @java.lang.Override public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVarOrBuilder getVarListOrBuilder( @@ -193,7 +193,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < varList_.size(); i++) { - output.writeMessage(1, varList_.get(i)); + output.writeMessage(3, varList_.get(i)); } unknownFields.writeTo(output); } @@ -206,7 +206,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < varList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, varList_.get(i)); + .computeMessageSize(3, varList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -337,8 +337,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23502
-     * Obf: JGINEENLNCF
+     * CmdId: 26464
+     * obf: JNNODCLPIDE
      *
* * Protobuf type {@code QuestGlobalVarNotify} @@ -538,7 +538,7 @@ private void ensureVarListIsMutable() { emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar, emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder, emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVarOrBuilder> varListBuilder_; /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public java.util.List getVarListList() { if (varListBuilder_ == null) { @@ -548,7 +548,7 @@ public java.util.Listrepeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public int getVarListCount() { if (varListBuilder_ == null) { @@ -558,7 +558,7 @@ public int getVarListCount() { } } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar getVarList(int index) { if (varListBuilder_ == null) { @@ -568,7 +568,7 @@ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar getVarL } } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder setVarList( int index, emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar value) { @@ -585,7 +585,7 @@ public Builder setVarList( return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder setVarList( int index, emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder builderForValue) { @@ -599,7 +599,7 @@ public Builder setVarList( return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder addVarList(emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar value) { if (varListBuilder_ == null) { @@ -615,7 +615,7 @@ public Builder addVarList(emu.grasscutter.net.proto.QuestGlobalVarOuterClass.Que return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder addVarList( int index, emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar value) { @@ -632,7 +632,7 @@ public Builder addVarList( return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder addVarList( emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder builderForValue) { @@ -646,7 +646,7 @@ public Builder addVarList( return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder addVarList( int index, emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder builderForValue) { @@ -660,7 +660,7 @@ public Builder addVarList( return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder addAllVarList( java.lang.Iterable values) { @@ -675,7 +675,7 @@ public Builder addAllVarList( return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder clearVarList() { if (varListBuilder_ == null) { @@ -688,7 +688,7 @@ public Builder clearVarList() { return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public Builder removeVarList(int index) { if (varListBuilder_ == null) { @@ -701,14 +701,14 @@ public Builder removeVarList(int index) { return this; } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder getVarListBuilder( int index) { return getVarListFieldBuilder().getBuilder(index); } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVarOrBuilder getVarListOrBuilder( int index) { @@ -718,7 +718,7 @@ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVarOrBuilde } } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public java.util.List getVarListOrBuilderList() { @@ -729,14 +729,14 @@ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVarOrBuilde } } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder addVarListBuilder() { return getVarListFieldBuilder().addBuilder( emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.getDefaultInstance()); } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder addVarListBuilder( int index) { @@ -744,7 +744,7 @@ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder index, emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.getDefaultInstance()); } /** - * repeated .QuestGlobalVar var_list = 1; + * repeated .QuestGlobalVar var_list = 3; */ public java.util.List getVarListBuilderList() { @@ -833,7 +833,7 @@ public emu.grasscutter.net.proto.QuestGlobalVarNotifyOuterClass.QuestGlobalVarNo java.lang.String[] descriptorData = { "\n\032QuestGlobalVarNotify.proto\032\024QuestGloba" + "lVar.proto\"9\n\024QuestGlobalVarNotify\022!\n\010va" + - "r_list\030\001 \003(\0132\017.QuestGlobalVarB\033\n\031emu.gra" + + "r_list\030\003 \003(\0132\017.QuestGlobalVarB\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestGlobalVarOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestGlobalVarOuterClass.java index d09490eaa94..732f94fcea0 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestGlobalVarOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestGlobalVarOuterClass.java @@ -19,20 +19,20 @@ public interface QuestGlobalVarOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 value = 14; + * int32 value = 5; * @return The value. */ int getValue(); /** - * uint32 key = 8; + * uint32 key = 7; * @return The key. */ int getKey(); } /** * 
-   * Obf: PGEKJBDCGND
+   * obf: JKLEDDOBLJI
    *
* * Protobuf type {@code QuestGlobalVar} @@ -79,14 +79,14 @@ private QuestGlobalVar( case 0: done = true; break; - case 64: { + case 40: { - key_ = input.readUInt32(); + value_ = input.readInt32(); break; } - case 112: { + case 56: { - value_ = input.readInt32(); + key_ = input.readUInt32(); break; } default: { @@ -121,10 +121,10 @@ private QuestGlobalVar( emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.class, emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar.Builder.class); } - public static final int VALUE_FIELD_NUMBER = 14; + public static final int VALUE_FIELD_NUMBER = 5; private int value_; /** - * int32 value = 14; + * int32 value = 5; * @return The value. */ @java.lang.Override @@ -132,10 +132,10 @@ public int getValue() { return value_; } - public static final int KEY_FIELD_NUMBER = 8; + public static final int KEY_FIELD_NUMBER = 7; private int key_; /** - * uint32 key = 8; + * uint32 key = 7; * @return The key. */ @java.lang.Override @@ -157,11 +157,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (key_ != 0) { - output.writeUInt32(8, key_); - } if (value_ != 0) { - output.writeInt32(14, value_); + output.writeInt32(5, value_); + } + if (key_ != 0) { + output.writeUInt32(7, key_); } unknownFields.writeTo(output); } @@ -172,13 +172,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (key_ != 0) { + if (value_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, key_); + .computeInt32Size(5, value_); } - if (value_ != 0) { + if (key_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(14, value_); + .computeUInt32Size(7, key_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -311,7 +311,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: PGEKJBDCGND
+     * obf: JKLEDDOBLJI
      *
* * Protobuf type {@code QuestGlobalVar} @@ -468,7 +468,7 @@ public Builder mergeFrom( private int value_ ; /** - * int32 value = 14; + * int32 value = 5; * @return The value. */ @java.lang.Override @@ -476,7 +476,7 @@ public int getValue() { return value_; } /** - * int32 value = 14; + * int32 value = 5; * @param value The value to set. * @return This builder for chaining. */ @@ -487,7 +487,7 @@ public Builder setValue(int value) { return this; } /** - * int32 value = 14; + * int32 value = 5; * @return This builder for chaining. */ public Builder clearValue() { @@ -499,7 +499,7 @@ public Builder clearValue() { private int key_ ; /** - * uint32 key = 8; + * uint32 key = 7; * @return The key. */ @java.lang.Override @@ -507,7 +507,7 @@ public int getKey() { return key_; } /** - * uint32 key = 8; + * uint32 key = 7; * @param value The key to set. * @return This builder for chaining. */ @@ -518,7 +518,7 @@ public Builder setKey(int value) { return this; } /** - * uint32 key = 8; + * uint32 key = 7; * @return This builder for chaining. */ public Builder clearKey() { @@ -595,7 +595,7 @@ public emu.grasscutter.net.proto.QuestGlobalVarOuterClass.QuestGlobalVar getDefa static { java.lang.String[] descriptorData = { "\n\024QuestGlobalVar.proto\",\n\016QuestGlobalVar" + - "\022\r\n\005value\030\016 \001(\005\022\013\n\003key\030\010 \001(\rB\033\n\031emu.gras" + + "\022\r\n\005value\030\005 \001(\005\022\013\n\003key\030\007 \001(\rB\033\n\031emu.gras" + "scutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitReqOuterClass.java index e71994359b3..57b6c6b00e8 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitReqOuterClass.java @@ -19,27 +19,27 @@ public interface QuestTransmitReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 quest_id = 2; + * uint32 text_id = 4; + * @return The textId. + */ + int getTextId(); + + /** + * uint32 quest_id = 8; * @return The questId. */ int getQuestId(); /** - * uint32 point_id = 1; + * uint32 point_id = 5; * @return The pointId. */ int getPointId(); - - /** - * uint32 LAJGLCIFKCP = 10; - * @return The lAJGLCIFKCP. - */ - int getLAJGLCIFKCP(); } /** * 
-   * CmdId: 2854
-   * Obf: FGDGCAJEJPM
+   * CmdId: 24079
+   * obf: IMNBBIKEBMH
    *
* * Protobuf type {@code QuestTransmitReq} @@ -86,19 +86,19 @@ private QuestTransmitReq( case 0: done = true; break; - case 8: { + case 32: { - pointId_ = input.readUInt32(); + textId_ = input.readUInt32(); break; } - case 16: { + case 40: { - questId_ = input.readUInt32(); + pointId_ = input.readUInt32(); break; } - case 80: { + case 64: { - lAJGLCIFKCP_ = input.readUInt32(); + questId_ = input.readUInt32(); break; } default: { @@ -133,10 +133,21 @@ private QuestTransmitReq( emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq.class, emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq.Builder.class); } - public static final int QUEST_ID_FIELD_NUMBER = 2; + public static final int TEXT_ID_FIELD_NUMBER = 4; + private int textId_; + /** + * uint32 text_id = 4; + * @return The textId. + */ + @java.lang.Override + public int getTextId() { + return textId_; + } + + public static final int QUEST_ID_FIELD_NUMBER = 8; private int questId_; /** - * uint32 quest_id = 2; + * uint32 quest_id = 8; * @return The questId. */ @java.lang.Override @@ -144,10 +155,10 @@ public int getQuestId() { return questId_; } - public static final int POINT_ID_FIELD_NUMBER = 1; + public static final int POINT_ID_FIELD_NUMBER = 5; private int pointId_; /** - * uint32 point_id = 1; + * uint32 point_id = 5; * @return The pointId. */ @java.lang.Override @@ -155,17 +166,6 @@ public int getPointId() { return pointId_; } - public static final int LAJGLCIFKCP_FIELD_NUMBER = 10; - private int lAJGLCIFKCP_; - /** - * uint32 LAJGLCIFKCP = 10; - * @return The lAJGLCIFKCP. - */ - @java.lang.Override - public int getLAJGLCIFKCP() { - return lAJGLCIFKCP_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (textId_ != 0) { + output.writeUInt32(4, textId_); + } if (pointId_ != 0) { - output.writeUInt32(1, pointId_); + output.writeUInt32(5, pointId_); } if (questId_ != 0) { - output.writeUInt32(2, questId_); - } - if (lAJGLCIFKCP_ != 0) { - output.writeUInt32(10, lAJGLCIFKCP_); + output.writeUInt32(8, questId_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (pointId_ != 0) { + if (textId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, pointId_); + .computeUInt32Size(4, textId_); } - if (questId_ != 0) { + if (pointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, questId_); + .computeUInt32Size(5, pointId_); } - if (lAJGLCIFKCP_ != 0) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, lAJGLCIFKCP_); + .computeUInt32Size(8, questId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +225,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq other = (emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq) obj; + if (getTextId() + != other.getTextId()) return false; if (getQuestId() != other.getQuestId()) return false; if (getPointId() != other.getPointId()) return false; - if (getLAJGLCIFKCP() - != other.getLAJGLCIFKCP()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +242,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + TEXT_ID_FIELD_NUMBER; + hash = (53 * hash) + getTextId(); hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; hash = (53 * hash) + getQuestId(); hash = (37 * hash) + POINT_ID_FIELD_NUMBER; hash = (53 * hash) + getPointId(); - hash = (37 * hash) + LAJGLCIFKCP_FIELD_NUMBER; - hash = (53 * hash) + getLAJGLCIFKCP(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2854
-     * Obf: FGDGCAJEJPM
+     * CmdId: 24079
+     * obf: IMNBBIKEBMH
      *
* * Protobuf type {@code QuestTransmitReq} @@ -386,12 +386,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + textId_ = 0; + questId_ = 0; pointId_ = 0; - lAJGLCIFKCP_ = 0; - return this; } @@ -418,9 +418,9 @@ public emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq bui @java.lang.Override public emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq buildPartial() { emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq result = new emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq(this); + result.textId_ = textId_; result.questId_ = questId_; result.pointId_ = pointId_; - result.lAJGLCIFKCP_ = lAJGLCIFKCP_; onBuilt(); return result; } @@ -469,15 +469,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq other) { if (other == emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq.getDefaultInstance()) return this; + if (other.getTextId() != 0) { + setTextId(other.getTextId()); + } if (other.getQuestId() != 0) { setQuestId(other.getQuestId()); } if (other.getPointId() != 0) { setPointId(other.getPointId()); } - if (other.getLAJGLCIFKCP() != 0) { - setLAJGLCIFKCP(other.getLAJGLCIFKCP()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -507,95 +507,95 @@ public Builder mergeFrom( return this; } - private int questId_ ; + private int textId_ ; /** - * uint32 quest_id = 2; - * @return The questId. + * uint32 text_id = 4; + * @return The textId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getTextId() { + return textId_; } /** - * uint32 quest_id = 2; - * @param value The questId to set. + * uint32 text_id = 4; + * @param value The textId to set. * @return This builder for chaining. */ - public Builder setQuestId(int value) { + public Builder setTextId(int value) { - questId_ = value; + textId_ = value; onChanged(); return this; } /** - * uint32 quest_id = 2; + * uint32 text_id = 4; * @return This builder for chaining. */ - public Builder clearQuestId() { + public Builder clearTextId() { - questId_ = 0; + textId_ = 0; onChanged(); return this; } - private int pointId_ ; + private int questId_ ; /** - * uint32 point_id = 1; - * @return The pointId. + * uint32 quest_id = 8; + * @return The questId. */ @java.lang.Override - public int getPointId() { - return pointId_; + public int getQuestId() { + return questId_; } /** - * uint32 point_id = 1; - * @param value The pointId to set. + * uint32 quest_id = 8; + * @param value The questId to set. * @return This builder for chaining. */ - public Builder setPointId(int value) { + public Builder setQuestId(int value) { - pointId_ = value; + questId_ = value; onChanged(); return this; } /** - * uint32 point_id = 1; + * uint32 quest_id = 8; * @return This builder for chaining. */ - public Builder clearPointId() { + public Builder clearQuestId() { - pointId_ = 0; + questId_ = 0; onChanged(); return this; } - private int lAJGLCIFKCP_ ; + private int pointId_ ; /** - * uint32 LAJGLCIFKCP = 10; - * @return The lAJGLCIFKCP. + * uint32 point_id = 5; + * @return The pointId. */ @java.lang.Override - public int getLAJGLCIFKCP() { - return lAJGLCIFKCP_; + public int getPointId() { + return pointId_; } /** - * uint32 LAJGLCIFKCP = 10; - * @param value The lAJGLCIFKCP to set. + * uint32 point_id = 5; + * @param value The pointId to set. * @return This builder for chaining. */ - public Builder setLAJGLCIFKCP(int value) { + public Builder setPointId(int value) { - lAJGLCIFKCP_ = value; + pointId_ = value; onChanged(); return this; } /** - * uint32 LAJGLCIFKCP = 10; + * uint32 point_id = 5; * @return This builder for chaining. */ - public Builder clearLAJGLCIFKCP() { + public Builder clearPointId() { - lAJGLCIFKCP_ = 0; + pointId_ = 0; onChanged(); return this; } @@ -666,10 +666,10 @@ public emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq get descriptor; static { java.lang.String[] descriptorData = { - "\n\026QuestTransmitReq.proto\"K\n\020QuestTransmi" + - "tReq\022\020\n\010quest_id\030\002 \001(\r\022\020\n\010point_id\030\001 \001(\r" + - "\022\023\n\013LAJGLCIFKCP\030\n \001(\rB\033\n\031emu.grasscutter" + - ".net.protob\006proto3" + "\n\026QuestTransmitReq.proto\"G\n\020QuestTransmi" + + "tReq\022\017\n\007text_id\030\004 \001(\r\022\020\n\010quest_id\030\010 \001(\r\022" + + "\020\n\010point_id\030\005 \001(\rB\033\n\031emu.grasscutter.net" + + ".protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.QuestTransmitReqOuterClass.QuestTransmitReq get internal_static_QuestTransmitReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QuestTransmitReq_descriptor, - new java.lang.String[] { "QuestId", "PointId", "LAJGLCIFKCP", }); + new java.lang.String[] { "TextId", "QuestId", "PointId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java index dffdca5b818..e9281ed4b9b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java @@ -37,6 +37,10 @@ public interface QuestTransmitRspOrBuilder extends int getRetcode(); } /** + * 
+   * CmdId: 2300
+   *
+ * * Protobuf type {@code QuestTransmitRsp} */ public static final class QuestTransmitRsp extends @@ -339,6 +343,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 2300
+     *
+ * * Protobuf type {@code QuestTransmitRsp} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarReqOuterClass.java index a58eaa24c31..9d0d07cff2e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarReqOuterClass.java @@ -19,51 +19,51 @@ public interface QuestUpdateQuestVarReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ java.util.List getQuestVarOpListList(); /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getQuestVarOpList(int index); /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ int getQuestVarOpListCount(); /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ java.util.List getQuestVarOpListOrBuilderList(); /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQuestVarOpListOrBuilder( int index); /** - * uint32 parent_quest_var_seq = 9; + * uint32 quest_id = 15; + * @return The questId. + */ + int getQuestId(); + + /** + * uint32 parent_quest_var_seq = 6; * @return The parentQuestVarSeq. */ int getParentQuestVarSeq(); /** - * uint32 parent_quest_id = 11; + * uint32 parent_quest_id = 5; * @return The parentQuestId. */ int getParentQuestId(); - - /** - * uint32 quest_id = 7; - * @return The questId. - */ - int getQuestId(); } /** * 
-   * CmdId: 28126
-   * Obf: CJGCHOPODCD
+   * CmdId: 24014
+   * obf: LFKCFOIDDMH
    *
* * Protobuf type {@code QuestUpdateQuestVarReq} @@ -112,12 +112,17 @@ private QuestUpdateQuestVarReq( case 0: done = true; break; - case 56: { + case 40: { - questId_ = input.readUInt32(); + parentQuestId_ = input.readUInt32(); + break; + } + case 48: { + + parentQuestVarSeq_ = input.readUInt32(); break; } - case 66: { + case 58: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { questVarOpList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -126,14 +131,9 @@ private QuestUpdateQuestVarReq( input.readMessage(emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.parser(), extensionRegistry)); break; } - case 72: { + case 120: { - parentQuestVarSeq_ = input.readUInt32(); - break; - } - case 88: { - - parentQuestId_ = input.readUInt32(); + questId_ = input.readUInt32(); break; } default: { @@ -171,17 +171,17 @@ private QuestUpdateQuestVarReq( emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq.class, emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQuestVarReq.Builder.class); } - public static final int QUEST_VAR_OP_LIST_FIELD_NUMBER = 8; + public static final int QUEST_VAR_OP_LIST_FIELD_NUMBER = 7; private java.util.List questVarOpList_; /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ @java.lang.Override public java.util.List getQuestVarOpListList() { return questVarOpList_; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ @java.lang.Override public java.util.List @@ -189,21 +189,21 @@ public java.util.List return questVarOpList_; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ @java.lang.Override public int getQuestVarOpListCount() { return questVarOpList_.size(); } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ @java.lang.Override public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getQuestVarOpList(int index) { return questVarOpList_.get(index); } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ @java.lang.Override public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQuestVarOpListOrBuilder( @@ -211,10 +211,21 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQue return questVarOpList_.get(index); } - public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 9; + public static final int QUEST_ID_FIELD_NUMBER = 15; + private int questId_; + /** + * uint32 quest_id = 15; + * @return The questId. + */ + @java.lang.Override + public int getQuestId() { + return questId_; + } + + public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 6; private int parentQuestVarSeq_; /** - * uint32 parent_quest_var_seq = 9; + * uint32 parent_quest_var_seq = 6; * @return The parentQuestVarSeq. */ @java.lang.Override @@ -222,10 +233,10 @@ public int getParentQuestVarSeq() { return parentQuestVarSeq_; } - public static final int PARENT_QUEST_ID_FIELD_NUMBER = 11; + public static final int PARENT_QUEST_ID_FIELD_NUMBER = 5; private int parentQuestId_; /** - * uint32 parent_quest_id = 11; + * uint32 parent_quest_id = 5; * @return The parentQuestId. */ @java.lang.Override @@ -233,17 +244,6 @@ public int getParentQuestId() { return parentQuestId_; } - public static final int QUEST_ID_FIELD_NUMBER = 7; - private int questId_; - /** - * uint32 quest_id = 7; - * @return The questId. - */ - @java.lang.Override - public int getQuestId() { - return questId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -258,17 +258,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (questId_ != 0) { - output.writeUInt32(7, questId_); - } - for (int i = 0; i < questVarOpList_.size(); i++) { - output.writeMessage(8, questVarOpList_.get(i)); + if (parentQuestId_ != 0) { + output.writeUInt32(5, parentQuestId_); } if (parentQuestVarSeq_ != 0) { - output.writeUInt32(9, parentQuestVarSeq_); + output.writeUInt32(6, parentQuestVarSeq_); } - if (parentQuestId_ != 0) { - output.writeUInt32(11, parentQuestId_); + for (int i = 0; i < questVarOpList_.size(); i++) { + output.writeMessage(7, questVarOpList_.get(i)); + } + if (questId_ != 0) { + output.writeUInt32(15, questId_); } unknownFields.writeTo(output); } @@ -279,21 +279,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (questId_ != 0) { + if (parentQuestId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, questId_); + .computeUInt32Size(5, parentQuestId_); } - for (int i = 0; i < questVarOpList_.size(); i++) { + if (parentQuestVarSeq_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, questVarOpList_.get(i)); + .computeUInt32Size(6, parentQuestVarSeq_); } - if (parentQuestVarSeq_ != 0) { + for (int i = 0; i < questVarOpList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, parentQuestVarSeq_); + .computeMessageSize(7, questVarOpList_.get(i)); } - if (parentQuestId_ != 0) { + if (questId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, parentQuestId_); + .computeUInt32Size(15, questId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -312,12 +312,12 @@ public boolean equals(final java.lang.Object obj) { if (!getQuestVarOpListList() .equals(other.getQuestVarOpListList())) return false; + if (getQuestId() + != other.getQuestId()) return false; if (getParentQuestVarSeq() != other.getParentQuestVarSeq()) return false; if (getParentQuestId() != other.getParentQuestId()) return false; - if (getQuestId() - != other.getQuestId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -333,12 +333,12 @@ public int hashCode() { hash = (37 * hash) + QUEST_VAR_OP_LIST_FIELD_NUMBER; hash = (53 * hash) + getQuestVarOpListList().hashCode(); } + hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; + hash = (53 * hash) + getQuestId(); hash = (37 * hash) + PARENT_QUEST_VAR_SEQ_FIELD_NUMBER; hash = (53 * hash) + getParentQuestVarSeq(); hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER; hash = (53 * hash) + getParentQuestId(); - hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; - hash = (53 * hash) + getQuestId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -436,8 +436,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28126
-     * Obf: CJGCHOPODCD
+     * CmdId: 24014
+     * obf: LFKCFOIDDMH
      *
* * Protobuf type {@code QuestUpdateQuestVarReq} @@ -484,12 +484,12 @@ public Builder clear() { } else { questVarOpListBuilder_.clear(); } + questId_ = 0; + parentQuestVarSeq_ = 0; parentQuestId_ = 0; - questId_ = 0; - return this; } @@ -526,9 +526,9 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQue } else { result.questVarOpList_ = questVarOpListBuilder_.build(); } + result.questId_ = questId_; result.parentQuestVarSeq_ = parentQuestVarSeq_; result.parentQuestId_ = parentQuestId_; - result.questId_ = questId_; onBuilt(); return result; } @@ -603,15 +603,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterCl } } } + if (other.getQuestId() != 0) { + setQuestId(other.getQuestId()); + } if (other.getParentQuestVarSeq() != 0) { setParentQuestVarSeq(other.getParentQuestVarSeq()); } if (other.getParentQuestId() != 0) { setParentQuestId(other.getParentQuestId()); } - if (other.getQuestId() != 0) { - setQuestId(other.getQuestId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -655,7 +655,7 @@ private void ensureQuestVarOpListIsMutable() { emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder> questVarOpListBuilder_; /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public java.util.List getQuestVarOpListList() { if (questVarOpListBuilder_ == null) { @@ -665,7 +665,7 @@ public java.util.List } } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public int getQuestVarOpListCount() { if (questVarOpListBuilder_ == null) { @@ -675,7 +675,7 @@ public int getQuestVarOpListCount() { } } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getQuestVarOpList(int index) { if (questVarOpListBuilder_ == null) { @@ -685,7 +685,7 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getQuestVarOpLi } } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder setQuestVarOpList( int index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp value) { @@ -702,7 +702,7 @@ public Builder setQuestVarOpList( return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder setQuestVarOpList( int index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder builderForValue) { @@ -716,7 +716,7 @@ public Builder setQuestVarOpList( return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder addQuestVarOpList(emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp value) { if (questVarOpListBuilder_ == null) { @@ -732,7 +732,7 @@ public Builder addQuestVarOpList(emu.grasscutter.net.proto.QuestVarOpOuterClass. return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder addQuestVarOpList( int index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp value) { @@ -749,7 +749,7 @@ public Builder addQuestVarOpList( return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder addQuestVarOpList( emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder builderForValue) { @@ -763,7 +763,7 @@ public Builder addQuestVarOpList( return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder addQuestVarOpList( int index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder builderForValue) { @@ -777,7 +777,7 @@ public Builder addQuestVarOpList( return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder addAllQuestVarOpList( java.lang.Iterable values) { @@ -792,7 +792,7 @@ public Builder addAllQuestVarOpList( return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder clearQuestVarOpList() { if (questVarOpListBuilder_ == null) { @@ -805,7 +805,7 @@ public Builder clearQuestVarOpList() { return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public Builder removeQuestVarOpList(int index) { if (questVarOpListBuilder_ == null) { @@ -818,14 +818,14 @@ public Builder removeQuestVarOpList(int index) { return this; } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder getQuestVarOpListBuilder( int index) { return getQuestVarOpListFieldBuilder().getBuilder(index); } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQuestVarOpListOrBuilder( int index) { @@ -835,7 +835,7 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQue } } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public java.util.List getQuestVarOpListOrBuilderList() { @@ -846,14 +846,14 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOpOrBuilder getQue } } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder addQuestVarOpListBuilder() { return getQuestVarOpListFieldBuilder().addBuilder( emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.getDefaultInstance()); } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder addQuestVarOpListBuilder( int index) { @@ -861,7 +861,7 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder addQues index, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.getDefaultInstance()); } /** - * repeated .QuestVarOp quest_var_op_list = 8; + * repeated .QuestVarOp quest_var_op_list = 7; */ public java.util.List getQuestVarOpListBuilderList() { @@ -882,95 +882,95 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder addQues return questVarOpListBuilder_; } - private int parentQuestVarSeq_ ; + private int questId_ ; /** - * uint32 parent_quest_var_seq = 9; - * @return The parentQuestVarSeq. + * uint32 quest_id = 15; + * @return The questId. */ @java.lang.Override - public int getParentQuestVarSeq() { - return parentQuestVarSeq_; + public int getQuestId() { + return questId_; } /** - * uint32 parent_quest_var_seq = 9; - * @param value The parentQuestVarSeq to set. + * uint32 quest_id = 15; + * @param value The questId to set. * @return This builder for chaining. */ - public Builder setParentQuestVarSeq(int value) { + public Builder setQuestId(int value) { - parentQuestVarSeq_ = value; + questId_ = value; onChanged(); return this; } /** - * uint32 parent_quest_var_seq = 9; + * uint32 quest_id = 15; * @return This builder for chaining. */ - public Builder clearParentQuestVarSeq() { + public Builder clearQuestId() { - parentQuestVarSeq_ = 0; + questId_ = 0; onChanged(); return this; } - private int parentQuestId_ ; + private int parentQuestVarSeq_ ; /** - * uint32 parent_quest_id = 11; - * @return The parentQuestId. + * uint32 parent_quest_var_seq = 6; + * @return The parentQuestVarSeq. */ @java.lang.Override - public int getParentQuestId() { - return parentQuestId_; + public int getParentQuestVarSeq() { + return parentQuestVarSeq_; } /** - * uint32 parent_quest_id = 11; - * @param value The parentQuestId to set. + * uint32 parent_quest_var_seq = 6; + * @param value The parentQuestVarSeq to set. * @return This builder for chaining. */ - public Builder setParentQuestId(int value) { + public Builder setParentQuestVarSeq(int value) { - parentQuestId_ = value; + parentQuestVarSeq_ = value; onChanged(); return this; } /** - * uint32 parent_quest_id = 11; + * uint32 parent_quest_var_seq = 6; * @return This builder for chaining. */ - public Builder clearParentQuestId() { + public Builder clearParentQuestVarSeq() { - parentQuestId_ = 0; + parentQuestVarSeq_ = 0; onChanged(); return this; } - private int questId_ ; + private int parentQuestId_ ; /** - * uint32 quest_id = 7; - * @return The questId. + * uint32 parent_quest_id = 5; + * @return The parentQuestId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getParentQuestId() { + return parentQuestId_; } /** - * uint32 quest_id = 7; - * @param value The questId to set. + * uint32 parent_quest_id = 5; + * @param value The parentQuestId to set. * @return This builder for chaining. */ - public Builder setQuestId(int value) { + public Builder setParentQuestId(int value) { - questId_ = value; + parentQuestId_ = value; onChanged(); return this; } /** - * uint32 quest_id = 7; + * uint32 parent_quest_id = 5; * @return This builder for chaining. */ - public Builder clearQuestId() { + public Builder clearParentQuestId() { - questId_ = 0; + parentQuestId_ = 0; onChanged(); return this; } @@ -1043,9 +1043,9 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQue java.lang.String[] descriptorData = { "\n\034QuestUpdateQuestVarReq.proto\032\020QuestVar" + "Op.proto\"\211\001\n\026QuestUpdateQuestVarReq\022&\n\021q" + - "uest_var_op_list\030\010 \003(\0132\013.QuestVarOp\022\034\n\024p" + - "arent_quest_var_seq\030\t \001(\r\022\027\n\017parent_ques" + - "t_id\030\013 \001(\r\022\020\n\010quest_id\030\007 \001(\rB\033\n\031emu.gras" + + "uest_var_op_list\030\007 \003(\0132\013.QuestVarOp\022\020\n\010q" + + "uest_id\030\017 \001(\r\022\034\n\024parent_quest_var_seq\030\006 " + + "\001(\r\022\027\n\017parent_quest_id\030\005 \001(\rB\033\n\031emu.gras" + "scutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1058,7 +1058,7 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarReqOuterClass.QuestUpdateQue internal_static_QuestUpdateQuestVarReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QuestUpdateQuestVarReq_descriptor, - new java.lang.String[] { "QuestVarOpList", "ParentQuestVarSeq", "ParentQuestId", "QuestId", }); + new java.lang.String[] { "QuestVarOpList", "QuestId", "ParentQuestVarSeq", "ParentQuestId", }); emu.grasscutter.net.proto.QuestVarOpOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarRspOuterClass.java index 77649b8d849..e14555d03f7 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarRspOuterClass.java @@ -19,33 +19,33 @@ public interface QuestUpdateQuestVarRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 parent_quest_var_seq = 10; + * uint32 parent_quest_var_seq = 5; * @return The parentQuestVarSeq. */ int getParentQuestVarSeq(); /** - * uint32 quest_id = 7; - * @return The questId. + * uint32 parent_quest_id = 10; + * @return The parentQuestId. */ - int getQuestId(); + int getParentQuestId(); /** - * int32 retcode = 14; + * int32 retcode = 12; * @return The retcode. */ int getRetcode(); /** - * uint32 parent_quest_id = 11; - * @return The parentQuestId. + * uint32 quest_id = 13; + * @return The questId. */ - int getParentQuestId(); + int getQuestId(); } /** * 
-   * CmdId: 5677
-   * Obf: ENCODHADEDM
+   * CmdId: 3297
+   * obf: CJBDBPKJIBD
    *
* * Protobuf type {@code QuestUpdateQuestVarRsp} @@ -92,24 +92,24 @@ private QuestUpdateQuestVarRsp( case 0: done = true; break; - case 56: { + case 40: { - questId_ = input.readUInt32(); + parentQuestVarSeq_ = input.readUInt32(); break; } case 80: { - parentQuestVarSeq_ = input.readUInt32(); + parentQuestId_ = input.readUInt32(); break; } - case 88: { + case 96: { - parentQuestId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 112: { + case 104: { - retcode_ = input.readInt32(); + questId_ = input.readUInt32(); break; } default: { @@ -144,10 +144,10 @@ private QuestUpdateQuestVarRsp( emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp.class, emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp.Builder.class); } - public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 10; + public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 5; private int parentQuestVarSeq_; /** - * uint32 parent_quest_var_seq = 10; + * uint32 parent_quest_var_seq = 5; * @return The parentQuestVarSeq. */ @java.lang.Override @@ -155,21 +155,21 @@ public int getParentQuestVarSeq() { return parentQuestVarSeq_; } - public static final int QUEST_ID_FIELD_NUMBER = 7; - private int questId_; + public static final int PARENT_QUEST_ID_FIELD_NUMBER = 10; + private int parentQuestId_; /** - * uint32 quest_id = 7; - * @return The questId. + * uint32 parent_quest_id = 10; + * @return The parentQuestId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getParentQuestId() { + return parentQuestId_; } - public static final int RETCODE_FIELD_NUMBER = 14; + public static final int RETCODE_FIELD_NUMBER = 12; private int retcode_; /** - * int32 retcode = 14; + * int32 retcode = 12; * @return The retcode. */ @java.lang.Override @@ -177,15 +177,15 @@ public int getRetcode() { return retcode_; } - public static final int PARENT_QUEST_ID_FIELD_NUMBER = 11; - private int parentQuestId_; + public static final int QUEST_ID_FIELD_NUMBER = 13; + private int questId_; /** - * uint32 parent_quest_id = 11; - * @return The parentQuestId. + * uint32 quest_id = 13; + * @return The questId. */ @java.lang.Override - public int getParentQuestId() { - return parentQuestId_; + public int getQuestId() { + return questId_; } private byte memoizedIsInitialized = -1; @@ -202,17 +202,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (questId_ != 0) { - output.writeUInt32(7, questId_); - } if (parentQuestVarSeq_ != 0) { - output.writeUInt32(10, parentQuestVarSeq_); + output.writeUInt32(5, parentQuestVarSeq_); } if (parentQuestId_ != 0) { - output.writeUInt32(11, parentQuestId_); + output.writeUInt32(10, parentQuestId_); } if (retcode_ != 0) { - output.writeInt32(14, retcode_); + output.writeInt32(12, retcode_); + } + if (questId_ != 0) { + output.writeUInt32(13, questId_); } unknownFields.writeTo(output); } @@ -223,21 +223,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (questId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, questId_); - } if (parentQuestVarSeq_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, parentQuestVarSeq_); + .computeUInt32Size(5, parentQuestVarSeq_); } if (parentQuestId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, parentQuestId_); + .computeUInt32Size(10, parentQuestId_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(14, retcode_); + .computeInt32Size(12, retcode_); + } + if (questId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(13, questId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -256,12 +256,12 @@ public boolean equals(final java.lang.Object obj) { if (getParentQuestVarSeq() != other.getParentQuestVarSeq()) return false; - if (getQuestId() - != other.getQuestId()) return false; - if (getRetcode() - != other.getRetcode()) return false; if (getParentQuestId() != other.getParentQuestId()) return false; + if (getRetcode() + != other.getRetcode()) return false; + if (getQuestId() + != other.getQuestId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -275,12 +275,12 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + PARENT_QUEST_VAR_SEQ_FIELD_NUMBER; hash = (53 * hash) + getParentQuestVarSeq(); - hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; - hash = (53 * hash) + getQuestId(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER; hash = (53 * hash) + getParentQuestId(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + QUEST_ID_FIELD_NUMBER; + hash = (53 * hash) + getQuestId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -378,8 +378,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5677
-     * Obf: ENCODHADEDM
+     * CmdId: 3297
+     * obf: CJBDBPKJIBD
      *
* * Protobuf type {@code QuestUpdateQuestVarRsp} @@ -421,11 +421,11 @@ public Builder clear() { super.clear(); parentQuestVarSeq_ = 0; - questId_ = 0; + parentQuestId_ = 0; retcode_ = 0; - parentQuestId_ = 0; + questId_ = 0; return this; } @@ -454,9 +454,9 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQue public emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp buildPartial() { emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp result = new emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQuestVarRsp(this); result.parentQuestVarSeq_ = parentQuestVarSeq_; - result.questId_ = questId_; - result.retcode_ = retcode_; result.parentQuestId_ = parentQuestId_; + result.retcode_ = retcode_; + result.questId_ = questId_; onBuilt(); return result; } @@ -508,14 +508,14 @@ public Builder mergeFrom(emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterCl if (other.getParentQuestVarSeq() != 0) { setParentQuestVarSeq(other.getParentQuestVarSeq()); } - if (other.getQuestId() != 0) { - setQuestId(other.getQuestId()); + if (other.getParentQuestId() != 0) { + setParentQuestId(other.getParentQuestId()); } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (other.getParentQuestId() != 0) { - setParentQuestId(other.getParentQuestId()); + if (other.getQuestId() != 0) { + setQuestId(other.getQuestId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -548,7 +548,7 @@ public Builder mergeFrom( private int parentQuestVarSeq_ ; /** - * uint32 parent_quest_var_seq = 10; + * uint32 parent_quest_var_seq = 5; * @return The parentQuestVarSeq. */ @java.lang.Override @@ -556,7 +556,7 @@ public int getParentQuestVarSeq() { return parentQuestVarSeq_; } /** - * uint32 parent_quest_var_seq = 10; + * uint32 parent_quest_var_seq = 5; * @param value The parentQuestVarSeq to set. * @return This builder for chaining. */ @@ -567,7 +567,7 @@ public Builder setParentQuestVarSeq(int value) { return this; } /** - * uint32 parent_quest_var_seq = 10; + * uint32 parent_quest_var_seq = 5; * @return This builder for chaining. */ public Builder clearParentQuestVarSeq() { @@ -577,40 +577,40 @@ public Builder clearParentQuestVarSeq() { return this; } - private int questId_ ; + private int parentQuestId_ ; /** - * uint32 quest_id = 7; - * @return The questId. + * uint32 parent_quest_id = 10; + * @return The parentQuestId. */ @java.lang.Override - public int getQuestId() { - return questId_; + public int getParentQuestId() { + return parentQuestId_; } /** - * uint32 quest_id = 7; - * @param value The questId to set. + * uint32 parent_quest_id = 10; + * @param value The parentQuestId to set. * @return This builder for chaining. */ - public Builder setQuestId(int value) { + public Builder setParentQuestId(int value) { - questId_ = value; + parentQuestId_ = value; onChanged(); return this; } /** - * uint32 quest_id = 7; + * uint32 parent_quest_id = 10; * @return This builder for chaining. */ - public Builder clearQuestId() { + public Builder clearParentQuestId() { - questId_ = 0; + parentQuestId_ = 0; onChanged(); return this; } private int retcode_ ; /** - * int32 retcode = 14; + * int32 retcode = 12; * @return The retcode. */ @java.lang.Override @@ -618,7 +618,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 14; + * int32 retcode = 12; * @param value The retcode to set. * @return This builder for chaining. */ @@ -629,7 +629,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 14; + * int32 retcode = 12; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -639,33 +639,33 @@ public Builder clearRetcode() { return this; } - private int parentQuestId_ ; + private int questId_ ; /** - * uint32 parent_quest_id = 11; - * @return The parentQuestId. + * uint32 quest_id = 13; + * @return The questId. */ @java.lang.Override - public int getParentQuestId() { - return parentQuestId_; + public int getQuestId() { + return questId_; } /** - * uint32 parent_quest_id = 11; - * @param value The parentQuestId to set. + * uint32 quest_id = 13; + * @param value The questId to set. * @return This builder for chaining. */ - public Builder setParentQuestId(int value) { + public Builder setQuestId(int value) { - parentQuestId_ = value; + questId_ = value; onChanged(); return this; } /** - * uint32 parent_quest_id = 11; + * uint32 quest_id = 13; * @return This builder for chaining. */ - public Builder clearParentQuestId() { + public Builder clearQuestId() { - parentQuestId_ = 0; + questId_ = 0; onChanged(); return this; } @@ -738,8 +738,8 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQue java.lang.String[] descriptorData = { "\n\034QuestUpdateQuestVarRsp.proto\"r\n\026QuestU" + "pdateQuestVarRsp\022\034\n\024parent_quest_var_seq" + - "\030\n \001(\r\022\020\n\010quest_id\030\007 \001(\r\022\017\n\007retcode\030\016 \001(" + - "\005\022\027\n\017parent_quest_id\030\013 \001(\rB\033\n\031emu.grassc" + + "\030\005 \001(\r\022\027\n\017parent_quest_id\030\n \001(\r\022\017\n\007retco" + + "de\030\014 \001(\005\022\020\n\010quest_id\030\r \001(\rB\033\n\031emu.grassc" + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -751,7 +751,7 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarRspOuterClass.QuestUpdateQue internal_static_QuestUpdateQuestVarRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QuestUpdateQuestVarRsp_descriptor, - new java.lang.String[] { "ParentQuestVarSeq", "QuestId", "Retcode", "ParentQuestId", }); + new java.lang.String[] { "ParentQuestVarSeq", "ParentQuestId", "Retcode", "QuestId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestVarOpOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestVarOpOuterClass.java index feaeba0def2..7e5c53aa2d1 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/QuestVarOpOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestVarOpOuterClass.java @@ -19,26 +19,26 @@ public interface QuestVarOpOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 value = 4; - * @return The value. - */ - int getValue(); - - /** - * uint32 index = 1; + * uint32 index = 7; * @return The index. */ int getIndex(); /** - * bool is_add = 11; + * bool is_add = 9; * @return The isAdd. */ boolean getIsAdd(); + + /** + * int32 value = 12; + * @return The value. + */ + int getValue(); } /** * 
-   * Obf: KCGCOKGAMJM
+   * obf: JEEINADADJM
    *
* * Protobuf type {@code QuestVarOp} @@ -85,19 +85,19 @@ private QuestVarOp( case 0: done = true; break; - case 8: { + case 56: { index_ = input.readUInt32(); break; } - case 32: { + case 72: { - value_ = input.readInt32(); + isAdd_ = input.readBool(); break; } - case 88: { + case 96: { - isAdd_ = input.readBool(); + value_ = input.readInt32(); break; } default: { @@ -132,21 +132,10 @@ private QuestVarOp( emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.class, emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.Builder.class); } - public static final int VALUE_FIELD_NUMBER = 4; - private int value_; - /** - * int32 value = 4; - * @return The value. - */ - @java.lang.Override - public int getValue() { - return value_; - } - - public static final int INDEX_FIELD_NUMBER = 1; + public static final int INDEX_FIELD_NUMBER = 7; private int index_; /** - * uint32 index = 1; + * uint32 index = 7; * @return The index. */ @java.lang.Override @@ -154,10 +143,10 @@ public int getIndex() { return index_; } - public static final int IS_ADD_FIELD_NUMBER = 11; + public static final int IS_ADD_FIELD_NUMBER = 9; private boolean isAdd_; /** - * bool is_add = 11; + * bool is_add = 9; * @return The isAdd. */ @java.lang.Override @@ -165,6 +154,17 @@ public boolean getIsAdd() { return isAdd_; } + public static final int VALUE_FIELD_NUMBER = 12; + private int value_; + /** + * int32 value = 12; + * @return The value. + */ + @java.lang.Override + public int getValue() { + return value_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -180,13 +180,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (index_ != 0) { - output.writeUInt32(1, index_); - } - if (value_ != 0) { - output.writeInt32(4, value_); + output.writeUInt32(7, index_); } if (isAdd_ != false) { - output.writeBool(11, isAdd_); + output.writeBool(9, isAdd_); + } + if (value_ != 0) { + output.writeInt32(12, value_); } unknownFields.writeTo(output); } @@ -199,15 +199,15 @@ public int getSerializedSize() { size = 0; if (index_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, index_); + .computeUInt32Size(7, index_); } - if (value_ != 0) { + if (isAdd_ != false) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, value_); + .computeBoolSize(9, isAdd_); } - if (isAdd_ != false) { + if (value_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(11, isAdd_); + .computeInt32Size(12, value_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -224,12 +224,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp other = (emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp) obj; - if (getValue() - != other.getValue()) return false; if (getIndex() != other.getIndex()) return false; if (getIsAdd() != other.getIsAdd()) return false; + if (getValue() + != other.getValue()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -241,13 +241,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + VALUE_FIELD_NUMBER; - hash = (53 * hash) + getValue(); hash = (37 * hash) + INDEX_FIELD_NUMBER; hash = (53 * hash) + getIndex(); hash = (37 * hash) + IS_ADD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsAdd()); + hash = (37 * hash) + VALUE_FIELD_NUMBER; + hash = (53 * hash) + getValue(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,7 +345,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: KCGCOKGAMJM
+     * obf: JEEINADADJM
      *
* * Protobuf type {@code QuestVarOp} @@ -385,12 +385,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - value_ = 0; - index_ = 0; isAdd_ = false; + value_ = 0; + return this; } @@ -417,9 +417,9 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp build() { @java.lang.Override public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp buildPartial() { emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp result = new emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp(this); - result.value_ = value_; result.index_ = index_; result.isAdd_ = isAdd_; + result.value_ = value_; onBuilt(); return result; } @@ -468,15 +468,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp other) { if (other == emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp.getDefaultInstance()) return this; - if (other.getValue() != 0) { - setValue(other.getValue()); - } if (other.getIndex() != 0) { setIndex(other.getIndex()); } if (other.getIsAdd() != false) { setIsAdd(other.getIsAdd()); } + if (other.getValue() != 0) { + setValue(other.getValue()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -506,95 +506,95 @@ public Builder mergeFrom( return this; } - private int value_ ; + private int index_ ; /** - * int32 value = 4; - * @return The value. + * uint32 index = 7; + * @return The index. */ @java.lang.Override - public int getValue() { - return value_; + public int getIndex() { + return index_; } /** - * int32 value = 4; - * @param value The value to set. + * uint32 index = 7; + * @param value The index to set. * @return This builder for chaining. */ - public Builder setValue(int value) { + public Builder setIndex(int value) { - value_ = value; + index_ = value; onChanged(); return this; } /** - * int32 value = 4; + * uint32 index = 7; * @return This builder for chaining. */ - public Builder clearValue() { + public Builder clearIndex() { - value_ = 0; + index_ = 0; onChanged(); return this; } - private int index_ ; + private boolean isAdd_ ; /** - * uint32 index = 1; - * @return The index. + * bool is_add = 9; + * @return The isAdd. */ @java.lang.Override - public int getIndex() { - return index_; + public boolean getIsAdd() { + return isAdd_; } /** - * uint32 index = 1; - * @param value The index to set. + * bool is_add = 9; + * @param value The isAdd to set. * @return This builder for chaining. */ - public Builder setIndex(int value) { + public Builder setIsAdd(boolean value) { - index_ = value; + isAdd_ = value; onChanged(); return this; } /** - * uint32 index = 1; + * bool is_add = 9; * @return This builder for chaining. */ - public Builder clearIndex() { + public Builder clearIsAdd() { - index_ = 0; + isAdd_ = false; onChanged(); return this; } - private boolean isAdd_ ; + private int value_ ; /** - * bool is_add = 11; - * @return The isAdd. + * int32 value = 12; + * @return The value. */ @java.lang.Override - public boolean getIsAdd() { - return isAdd_; + public int getValue() { + return value_; } /** - * bool is_add = 11; - * @param value The isAdd to set. + * int32 value = 12; + * @param value The value to set. * @return This builder for chaining. */ - public Builder setIsAdd(boolean value) { + public Builder setValue(int value) { - isAdd_ = value; + value_ = value; onChanged(); return this; } /** - * bool is_add = 11; + * int32 value = 12; * @return This builder for chaining. */ - public Builder clearIsAdd() { + public Builder clearValue() { - isAdd_ = false; + value_ = 0; onChanged(); return this; } @@ -665,8 +665,8 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getDefaultInsta descriptor; static { java.lang.String[] descriptorData = { - "\n\020QuestVarOp.proto\":\n\nQuestVarOp\022\r\n\005valu" + - "e\030\004 \001(\005\022\r\n\005index\030\001 \001(\r\022\016\n\006is_add\030\013 \001(\010B\033" + + "\n\020QuestVarOp.proto\":\n\nQuestVarOp\022\r\n\005inde" + + "x\030\007 \001(\r\022\016\n\006is_add\030\t \001(\010\022\r\n\005value\030\014 \001(\005B\033" + "\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -678,7 +678,7 @@ public emu.grasscutter.net.proto.QuestVarOpOuterClass.QuestVarOp getDefaultInsta internal_static_QuestVarOp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_QuestVarOp_descriptor, - new java.lang.String[] { "Value", "Index", "IsAdd", }); + new java.lang.String[] { "Index", "IsAdd", "Value", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReceivedTrialAvatarActivityRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReceivedTrialAvatarActivityRewardReqOuterClass.java index f812c898e27..4dd2305da99 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ReceivedTrialAvatarActivityRewardReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ReceivedTrialAvatarActivityRewardReqOuterClass.java @@ -19,15 +19,14 @@ public interface ReceivedTrialAvatarActivityRewardReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 trial_avatar_index_id = 7; + * uint32 trial_avatar_index_id = 13; * @return The trialAvatarIndexId. */ int getTrialAvatarIndexId(); } /** * 
-   * CmdId: 8615
-   * Obf: DGNFHHHNOAJ
+   * CmdId: 5449
    *
* * Protobuf type {@code ReceivedTrialAvatarActivityRewardReq} @@ -74,7 +73,7 @@ private ReceivedTrialAvatarActivityRewardReq( case 0: done = true; break; - case 56: { + case 104: { trialAvatarIndexId_ = input.readUInt32(); break; @@ -111,10 +110,10 @@ private ReceivedTrialAvatarActivityRewardReq( emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardReqOuterClass.ReceivedTrialAvatarActivityRewardReq.class, emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardReqOuterClass.ReceivedTrialAvatarActivityRewardReq.Builder.class); } - public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 7; + public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 13; private int trialAvatarIndexId_; /** - * uint32 trial_avatar_index_id = 7; + * uint32 trial_avatar_index_id = 13; * @return The trialAvatarIndexId. */ @java.lang.Override @@ -137,7 +136,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (trialAvatarIndexId_ != 0) { - output.writeUInt32(7, trialAvatarIndexId_); + output.writeUInt32(13, trialAvatarIndexId_); } unknownFields.writeTo(output); } @@ -150,7 +149,7 @@ public int getSerializedSize() { size = 0; if (trialAvatarIndexId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, trialAvatarIndexId_); + .computeUInt32Size(13, trialAvatarIndexId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +278,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 8615
-     * Obf: DGNFHHHNOAJ
+     * CmdId: 5449
      *
* * Protobuf type {@code ReceivedTrialAvatarActivityRewardReq} @@ -431,7 +429,7 @@ public Builder mergeFrom( private int trialAvatarIndexId_ ; /** - * uint32 trial_avatar_index_id = 7; + * uint32 trial_avatar_index_id = 13; * @return The trialAvatarIndexId. */ @java.lang.Override @@ -439,7 +437,7 @@ public int getTrialAvatarIndexId() { return trialAvatarIndexId_; } /** - * uint32 trial_avatar_index_id = 7; + * uint32 trial_avatar_index_id = 13; * @param value The trialAvatarIndexId to set. * @return This builder for chaining. */ @@ -450,7 +448,7 @@ public Builder setTrialAvatarIndexId(int value) { return this; } /** - * uint32 trial_avatar_index_id = 7; + * uint32 trial_avatar_index_id = 13; * @return This builder for chaining. */ public Builder clearTrialAvatarIndexId() { @@ -528,7 +526,7 @@ public emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardReqOuterClass. java.lang.String[] descriptorData = { "\n*ReceivedTrialAvatarActivityRewardReq.p" + "roto\"E\n$ReceivedTrialAvatarActivityRewar" + - "dReq\022\035\n\025trial_avatar_index_id\030\007 \001(\rB\033\n\031e" + + "dReq\022\035\n\025trial_avatar_index_id\030\r \001(\rB\033\n\031e" + "mu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReceivedTrialAvatarActivityRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReceivedTrialAvatarActivityRewardRspOuterClass.java index b96446e3e85..84dde144f6d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ReceivedTrialAvatarActivityRewardRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ReceivedTrialAvatarActivityRewardRspOuterClass.java @@ -19,27 +19,26 @@ public interface ReceivedTrialAvatarActivityRewardRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 8; - * @return The retcode. + * uint32 trial_avatar_index_id = 4; + * @return The trialAvatarIndexId. */ - int getRetcode(); + int getTrialAvatarIndexId(); /** - * uint32 trial_avatar_index_id = 2; - * @return The trialAvatarIndexId. + * int32 retcode = 8; + * @return The retcode. */ - int getTrialAvatarIndexId(); + int getRetcode(); /** - * uint32 activity_id = 1; + * uint32 activity_id = 9; * @return The activityId. */ int getActivityId(); } /** * 
-   * CmdId: 9311
-   * Obf: MHBGIHPNPPL
+   * CmdId: 1551
    *
* * Protobuf type {@code ReceivedTrialAvatarActivityRewardRsp} @@ -86,12 +85,7 @@ private ReceivedTrialAvatarActivityRewardRsp( case 0: done = true; break; - case 8: { - - activityId_ = input.readUInt32(); - break; - } - case 16: { + case 32: { trialAvatarIndexId_ = input.readUInt32(); break; @@ -101,6 +95,11 @@ private ReceivedTrialAvatarActivityRewardRsp( retcode_ = input.readInt32(); break; } + case 72: { + + activityId_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -133,6 +132,17 @@ private ReceivedTrialAvatarActivityRewardRsp( emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp.class, emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp.Builder.class); } + public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 4; + private int trialAvatarIndexId_; + /** + * uint32 trial_avatar_index_id = 4; + * @return The trialAvatarIndexId. + */ + @java.lang.Override + public int getTrialAvatarIndexId() { + return trialAvatarIndexId_; + } + public static final int RETCODE_FIELD_NUMBER = 8; private int retcode_; /** @@ -144,21 +154,10 @@ public int getRetcode() { return retcode_; } - public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 2; - private int trialAvatarIndexId_; - /** - * uint32 trial_avatar_index_id = 2; - * @return The trialAvatarIndexId. - */ - @java.lang.Override - public int getTrialAvatarIndexId() { - return trialAvatarIndexId_; - } - - public static final int ACTIVITY_ID_FIELD_NUMBER = 1; + public static final int ACTIVITY_ID_FIELD_NUMBER = 9; private int activityId_; /** - * uint32 activity_id = 1; + * uint32 activity_id = 9; * @return The activityId. */ @java.lang.Override @@ -180,15 +179,15 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (activityId_ != 0) { - output.writeUInt32(1, activityId_); - } if (trialAvatarIndexId_ != 0) { - output.writeUInt32(2, trialAvatarIndexId_); + output.writeUInt32(4, trialAvatarIndexId_); } if (retcode_ != 0) { output.writeInt32(8, retcode_); } + if (activityId_ != 0) { + output.writeUInt32(9, activityId_); + } unknownFields.writeTo(output); } @@ -198,18 +197,18 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (activityId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, activityId_); - } if (trialAvatarIndexId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, trialAvatarIndexId_); + .computeUInt32Size(4, trialAvatarIndexId_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(8, retcode_); } + if (activityId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(9, activityId_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -225,10 +224,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp other = (emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; if (getTrialAvatarIndexId() != other.getTrialAvatarIndexId()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (getActivityId() != other.getActivityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -242,10 +241,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER; hash = (53 * hash) + getTrialAvatarIndexId(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER; hash = (53 * hash) + getActivityId(); hash = (29 * hash) + unknownFields.hashCode(); @@ -345,8 +344,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 9311
-     * Obf: MHBGIHPNPPL
+     * CmdId: 1551
      *
* * Protobuf type {@code ReceivedTrialAvatarActivityRewardRsp} @@ -386,10 +384,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; - trialAvatarIndexId_ = 0; + retcode_ = 0; + activityId_ = 0; return this; @@ -418,8 +416,8 @@ public emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass. @java.lang.Override public emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp buildPartial() { emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp result = new emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp(this); - result.retcode_ = retcode_; result.trialAvatarIndexId_ = trialAvatarIndexId_; + result.retcode_ = retcode_; result.activityId_ = activityId_; onBuilt(); return result; @@ -469,12 +467,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp other) { if (other == emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass.ReceivedTrialAvatarActivityRewardRsp.getDefaultInstance()) return this; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (other.getTrialAvatarIndexId() != 0) { setTrialAvatarIndexId(other.getTrialAvatarIndexId()); } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } if (other.getActivityId() != 0) { setActivityId(other.getActivityId()); } @@ -507,71 +505,71 @@ public Builder mergeFrom( return this; } - private int retcode_ ; + private int trialAvatarIndexId_ ; /** - * int32 retcode = 8; - * @return The retcode. + * uint32 trial_avatar_index_id = 4; + * @return The trialAvatarIndexId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getTrialAvatarIndexId() { + return trialAvatarIndexId_; } /** - * int32 retcode = 8; - * @param value The retcode to set. + * uint32 trial_avatar_index_id = 4; + * @param value The trialAvatarIndexId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setTrialAvatarIndexId(int value) { - retcode_ = value; + trialAvatarIndexId_ = value; onChanged(); return this; } /** - * int32 retcode = 8; + * uint32 trial_avatar_index_id = 4; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearTrialAvatarIndexId() { - retcode_ = 0; + trialAvatarIndexId_ = 0; onChanged(); return this; } - private int trialAvatarIndexId_ ; + private int retcode_ ; /** - * uint32 trial_avatar_index_id = 2; - * @return The trialAvatarIndexId. + * int32 retcode = 8; + * @return The retcode. */ @java.lang.Override - public int getTrialAvatarIndexId() { - return trialAvatarIndexId_; + public int getRetcode() { + return retcode_; } /** - * uint32 trial_avatar_index_id = 2; - * @param value The trialAvatarIndexId to set. + * int32 retcode = 8; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setTrialAvatarIndexId(int value) { + public Builder setRetcode(int value) { - trialAvatarIndexId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 trial_avatar_index_id = 2; + * int32 retcode = 8; * @return This builder for chaining. */ - public Builder clearTrialAvatarIndexId() { + public Builder clearRetcode() { - trialAvatarIndexId_ = 0; + retcode_ = 0; onChanged(); return this; } private int activityId_ ; /** - * uint32 activity_id = 1; + * uint32 activity_id = 9; * @return The activityId. */ @java.lang.Override @@ -579,7 +577,7 @@ public int getActivityId() { return activityId_; } /** - * uint32 activity_id = 1; + * uint32 activity_id = 9; * @param value The activityId to set. * @return This builder for chaining. */ @@ -590,7 +588,7 @@ public Builder setActivityId(int value) { return this; } /** - * uint32 activity_id = 1; + * uint32 activity_id = 9; * @return This builder for chaining. */ public Builder clearActivityId() { @@ -668,8 +666,8 @@ public emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass. java.lang.String[] descriptorData = { "\n*ReceivedTrialAvatarActivityRewardRsp.p" + "roto\"k\n$ReceivedTrialAvatarActivityRewar" + - "dRsp\022\017\n\007retcode\030\010 \001(\005\022\035\n\025trial_avatar_in" + - "dex_id\030\002 \001(\r\022\023\n\013activity_id\030\001 \001(\rB\033\n\031emu" + + "dRsp\022\035\n\025trial_avatar_index_id\030\004 \001(\r\022\017\n\007r" + + "etcode\030\010 \001(\005\022\023\n\013activity_id\030\t \001(\rB\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +679,7 @@ public emu.grasscutter.net.proto.ReceivedTrialAvatarActivityRewardRspOuterClass. internal_static_ReceivedTrialAvatarActivityRewardRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ReceivedTrialAvatarActivityRewardRsp_descriptor, - new java.lang.String[] { "Retcode", "TrialAvatarIndexId", "ActivityId", }); + new java.lang.String[] { "TrialAvatarIndexId", "Retcode", "ActivityId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryDecomposeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryDecomposeReqOuterClass.java index ab8e0e10fd7..ddbb0062d3d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryDecomposeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryDecomposeReqOuterClass.java @@ -19,38 +19,38 @@ public interface ReliquaryDecomposeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 target_count = 15; - * @return The targetCount. - */ - int getTargetCount(); - - /** - * uint32 config_id = 1; - * @return The configId. - */ - int getConfigId(); - - /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @return A list containing the guidList. */ java.util.List getGuidListList(); /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @return The count of guidList. */ int getGuidListCount(); /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @param index The index of the element to return. * @return The guidList at the given index. */ long getGuidList(int index); + + /** + * uint32 target_count = 2; + * @return The targetCount. + */ + int getTargetCount(); + + /** + * uint32 config_id = 1; + * @return The configId. + */ + int getConfigId(); } /** * 
-   * CmdId: 2906
-   * Obf: BEGHJCKOHCA
+   * CmdId: 4929
+   * obf: NJOHAIGICCH
    *
* * Protobuf type {@code ReliquaryDecomposeReq} @@ -104,7 +104,12 @@ private ReliquaryDecomposeReq( configId_ = input.readUInt32(); break; } - case 64: { + case 16: { + + targetCount_ = input.readUInt32(); + break; + } + case 40: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { guidList_ = newLongList(); mutable_bitField0_ |= 0x00000001; @@ -112,7 +117,7 @@ private ReliquaryDecomposeReq( guidList_.addLong(input.readUInt64()); break; } - case 66: { + case 42: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -125,11 +130,6 @@ private ReliquaryDecomposeReq( input.popLimit(limit); break; } - case 120: { - - targetCount_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -165,32 +165,10 @@ private ReliquaryDecomposeReq( emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq.class, emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq.Builder.class); } - public static final int TARGET_COUNT_FIELD_NUMBER = 15; - private int targetCount_; - /** - * uint32 target_count = 15; - * @return The targetCount. - */ - @java.lang.Override - public int getTargetCount() { - return targetCount_; - } - - public static final int CONFIG_ID_FIELD_NUMBER = 1; - private int configId_; - /** - * uint32 config_id = 1; - * @return The configId. - */ - @java.lang.Override - public int getConfigId() { - return configId_; - } - - public static final int GUID_LIST_FIELD_NUMBER = 8; + public static final int GUID_LIST_FIELD_NUMBER = 5; private com.google.protobuf.Internal.LongList guidList_; /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @return A list containing the guidList. */ @java.lang.Override @@ -199,14 +177,14 @@ public int getConfigId() { return guidList_; } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @return The count of guidList. */ public int getGuidListCount() { return guidList_.size(); } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @param index The index of the element to return. * @return The guidList at the given index. */ @@ -215,6 +193,28 @@ public long getGuidList(int index) { } private int guidListMemoizedSerializedSize = -1; + public static final int TARGET_COUNT_FIELD_NUMBER = 2; + private int targetCount_; + /** + * uint32 target_count = 2; + * @return The targetCount. + */ + @java.lang.Override + public int getTargetCount() { + return targetCount_; + } + + public static final int CONFIG_ID_FIELD_NUMBER = 1; + private int configId_; + /** + * uint32 config_id = 1; + * @return The configId. + */ + @java.lang.Override + public int getConfigId() { + return configId_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -233,16 +233,16 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (configId_ != 0) { output.writeUInt32(1, configId_); } + if (targetCount_ != 0) { + output.writeUInt32(2, targetCount_); + } if (getGuidListList().size() > 0) { - output.writeUInt32NoTag(66); + output.writeUInt32NoTag(42); output.writeUInt32NoTag(guidListMemoizedSerializedSize); } for (int i = 0; i < guidList_.size(); i++) { output.writeUInt64NoTag(guidList_.getLong(i)); } - if (targetCount_ != 0) { - output.writeUInt32(15, targetCount_); - } unknownFields.writeTo(output); } @@ -256,6 +256,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(1, configId_); } + if (targetCount_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(2, targetCount_); + } { int dataSize = 0; for (int i = 0; i < guidList_.size(); i++) { @@ -270,10 +274,6 @@ public int getSerializedSize() { } guidListMemoizedSerializedSize = dataSize; } - if (targetCount_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, targetCount_); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -289,12 +289,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq other = (emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq) obj; + if (!getGuidListList() + .equals(other.getGuidListList())) return false; if (getTargetCount() != other.getTargetCount()) return false; if (getConfigId() != other.getConfigId()) return false; - if (!getGuidListList() - .equals(other.getGuidListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -306,14 +306,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + TARGET_COUNT_FIELD_NUMBER; - hash = (53 * hash) + getTargetCount(); - hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER; - hash = (53 * hash) + getConfigId(); if (getGuidListCount() > 0) { hash = (37 * hash) + GUID_LIST_FIELD_NUMBER; hash = (53 * hash) + getGuidListList().hashCode(); } + hash = (37 * hash) + TARGET_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getTargetCount(); + hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER; + hash = (53 * hash) + getConfigId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -411,8 +411,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2906
-     * Obf: BEGHJCKOHCA
+     * CmdId: 4929
+     * obf: NJOHAIGICCH
      *
* * Protobuf type {@code ReliquaryDecomposeReq} @@ -452,12 +452,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + guidList_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000001); targetCount_ = 0; configId_ = 0; - guidList_ = emptyLongList(); - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -485,13 +485,13 @@ public emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomp public emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq buildPartial() { emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq result = new emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq(this); int from_bitField0_ = bitField0_; - result.targetCount_ = targetCount_; - result.configId_ = configId_; if (((bitField0_ & 0x00000001) != 0)) { guidList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.guidList_ = guidList_; + result.targetCount_ = targetCount_; + result.configId_ = configId_; onBuilt(); return result; } @@ -540,12 +540,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq other) { if (other == emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomposeReq.getDefaultInstance()) return this; - if (other.getTargetCount() != 0) { - setTargetCount(other.getTargetCount()); - } - if (other.getConfigId() != 0) { - setConfigId(other.getConfigId()); - } if (!other.guidList_.isEmpty()) { if (guidList_.isEmpty()) { guidList_ = other.guidList_; @@ -556,6 +550,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterCla } onChanged(); } + if (other.getTargetCount() != 0) { + setTargetCount(other.getTargetCount()); + } + if (other.getConfigId() != 0) { + setConfigId(other.getConfigId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -586,68 +586,6 @@ public Builder mergeFrom( } private int bitField0_; - private int targetCount_ ; - /** - * uint32 target_count = 15; - * @return The targetCount. - */ - @java.lang.Override - public int getTargetCount() { - return targetCount_; - } - /** - * uint32 target_count = 15; - * @param value The targetCount to set. - * @return This builder for chaining. - */ - public Builder setTargetCount(int value) { - - targetCount_ = value; - onChanged(); - return this; - } - /** - * uint32 target_count = 15; - * @return This builder for chaining. - */ - public Builder clearTargetCount() { - - targetCount_ = 0; - onChanged(); - return this; - } - - private int configId_ ; - /** - * uint32 config_id = 1; - * @return The configId. - */ - @java.lang.Override - public int getConfigId() { - return configId_; - } - /** - * uint32 config_id = 1; - * @param value The configId to set. - * @return This builder for chaining. - */ - public Builder setConfigId(int value) { - - configId_ = value; - onChanged(); - return this; - } - /** - * uint32 config_id = 1; - * @return This builder for chaining. - */ - public Builder clearConfigId() { - - configId_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.Internal.LongList guidList_ = emptyLongList(); private void ensureGuidListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { @@ -656,7 +594,7 @@ private void ensureGuidListIsMutable() { } } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @return A list containing the guidList. */ public java.util.List @@ -665,14 +603,14 @@ private void ensureGuidListIsMutable() { java.util.Collections.unmodifiableList(guidList_) : guidList_; } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @return The count of guidList. */ public int getGuidListCount() { return guidList_.size(); } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @param index The index of the element to return. * @return The guidList at the given index. */ @@ -680,7 +618,7 @@ public long getGuidList(int index) { return guidList_.getLong(index); } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @param index The index to set the value at. * @param value The guidList to set. * @return This builder for chaining. @@ -693,7 +631,7 @@ public Builder setGuidList( return this; } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @param value The guidList to add. * @return This builder for chaining. */ @@ -704,7 +642,7 @@ public Builder addGuidList(long value) { return this; } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @param values The guidList to add. * @return This builder for chaining. */ @@ -717,7 +655,7 @@ public Builder addAllGuidList( return this; } /** - * repeated uint64 guid_list = 8; + * repeated uint64 guid_list = 5; * @return This builder for chaining. */ public Builder clearGuidList() { @@ -726,6 +664,68 @@ public Builder clearGuidList() { onChanged(); return this; } + + private int targetCount_ ; + /** + * uint32 target_count = 2; + * @return The targetCount. + */ + @java.lang.Override + public int getTargetCount() { + return targetCount_; + } + /** + * uint32 target_count = 2; + * @param value The targetCount to set. + * @return This builder for chaining. + */ + public Builder setTargetCount(int value) { + + targetCount_ = value; + onChanged(); + return this; + } + /** + * uint32 target_count = 2; + * @return This builder for chaining. + */ + public Builder clearTargetCount() { + + targetCount_ = 0; + onChanged(); + return this; + } + + private int configId_ ; + /** + * uint32 config_id = 1; + * @return The configId. + */ + @java.lang.Override + public int getConfigId() { + return configId_; + } + /** + * uint32 config_id = 1; + * @param value The configId to set. + * @return This builder for chaining. + */ + public Builder setConfigId(int value) { + + configId_ = value; + onChanged(); + return this; + } + /** + * uint32 config_id = 1; + * @return This builder for chaining. + */ + public Builder clearConfigId() { + + configId_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -794,8 +794,8 @@ public emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomp static { java.lang.String[] descriptorData = { "\n\033ReliquaryDecomposeReq.proto\"S\n\025Reliqua" + - "ryDecomposeReq\022\024\n\014target_count\030\017 \001(\r\022\021\n\t" + - "config_id\030\001 \001(\r\022\021\n\tguid_list\030\010 \003(\004B\033\n\031em" + + "ryDecomposeReq\022\021\n\tguid_list\030\005 \003(\004\022\024\n\014tar" + + "get_count\030\002 \001(\r\022\021\n\tconfig_id\030\001 \001(\rB\033\n\031em" + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -807,7 +807,7 @@ public emu.grasscutter.net.proto.ReliquaryDecomposeReqOuterClass.ReliquaryDecomp internal_static_ReliquaryDecomposeReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ReliquaryDecomposeReq_descriptor, - new java.lang.String[] { "TargetCount", "ConfigId", "GuidList", }); + new java.lang.String[] { "GuidList", "TargetCount", "ConfigId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryDecomposeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryDecomposeRspOuterClass.java index f2638f6128f..120f212d41d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryDecomposeRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryDecomposeRspOuterClass.java @@ -19,32 +19,32 @@ public interface ReliquaryDecomposeRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint64 guid_list = 9; + * int32 retcode = 1; + * @return The retcode. + */ + int getRetcode(); + + /** + * repeated uint64 guid_list = 13; * @return A list containing the guidList. */ java.util.List getGuidListList(); /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @return The count of guidList. */ int getGuidListCount(); /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @param index The index of the element to return. * @return The guidList at the given index. */ long getGuidList(int index); - - /** - * int32 retcode = 2; - * @return The retcode. - */ - int getRetcode(); } /** * 
-   * CmdId: 5943
-   * Obf: AGGLLEHOPED
+   * CmdId: 21659
+   * obf: IEBFCFMHLFG
    *
* * Protobuf type {@code ReliquaryDecomposeRsp} @@ -93,12 +93,12 @@ private ReliquaryDecomposeRsp( case 0: done = true; break; - case 16: { + case 8: { retcode_ = input.readInt32(); break; } - case 72: { + case 104: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { guidList_ = newLongList(); mutable_bitField0_ |= 0x00000001; @@ -106,7 +106,7 @@ private ReliquaryDecomposeRsp( guidList_.addLong(input.readUInt64()); break; } - case 74: { + case 106: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -154,10 +154,21 @@ private ReliquaryDecomposeRsp( emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp.class, emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp.Builder.class); } - public static final int GUID_LIST_FIELD_NUMBER = 9; + public static final int RETCODE_FIELD_NUMBER = 1; + private int retcode_; + /** + * int32 retcode = 1; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int GUID_LIST_FIELD_NUMBER = 13; private com.google.protobuf.Internal.LongList guidList_; /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @return A list containing the guidList. */ @java.lang.Override @@ -166,14 +177,14 @@ private ReliquaryDecomposeRsp( return guidList_; } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @return The count of guidList. */ public int getGuidListCount() { return guidList_.size(); } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @param index The index of the element to return. * @return The guidList at the given index. */ @@ -182,17 +193,6 @@ public long getGuidList(int index) { } private int guidListMemoizedSerializedSize = -1; - public static final int RETCODE_FIELD_NUMBER = 2; - private int retcode_; - /** - * int32 retcode = 2; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -209,10 +209,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (retcode_ != 0) { - output.writeInt32(2, retcode_); + output.writeInt32(1, retcode_); } if (getGuidListList().size() > 0) { - output.writeUInt32NoTag(74); + output.writeUInt32NoTag(106); output.writeUInt32NoTag(guidListMemoizedSerializedSize); } for (int i = 0; i < guidList_.size(); i++) { @@ -229,7 +229,7 @@ public int getSerializedSize() { size = 0; if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, retcode_); + .computeInt32Size(1, retcode_); } { int dataSize = 0; @@ -260,10 +260,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp other = (emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp) obj; - if (!getGuidListList() - .equals(other.getGuidListList())) return false; if (getRetcode() != other.getRetcode()) return false; + if (!getGuidListList() + .equals(other.getGuidListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -275,12 +275,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); if (getGuidListCount() > 0) { hash = (37 * hash) + GUID_LIST_FIELD_NUMBER; hash = (53 * hash) + getGuidListList().hashCode(); } - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -378,8 +378,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5943
-     * Obf: AGGLLEHOPED
+     * CmdId: 21659
+     * obf: IEBFCFMHLFG
      *
* * Protobuf type {@code ReliquaryDecomposeRsp} @@ -419,10 +419,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - guidList_ = emptyLongList(); - bitField0_ = (bitField0_ & ~0x00000001); retcode_ = 0; + guidList_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -450,12 +450,12 @@ public emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomp public emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp buildPartial() { emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp result = new emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp(this); int from_bitField0_ = bitField0_; + result.retcode_ = retcode_; if (((bitField0_ & 0x00000001) != 0)) { guidList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.guidList_ = guidList_; - result.retcode_ = retcode_; onBuilt(); return result; } @@ -504,6 +504,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp other) { if (other == emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomposeRsp.getDefaultInstance()) return this; + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } if (!other.guidList_.isEmpty()) { if (guidList_.isEmpty()) { guidList_ = other.guidList_; @@ -514,9 +517,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterCla } onChanged(); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -547,6 +547,37 @@ public Builder mergeFrom( } private int bitField0_; + private int retcode_ ; + /** + * int32 retcode = 1; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 1; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 1; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + private com.google.protobuf.Internal.LongList guidList_ = emptyLongList(); private void ensureGuidListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { @@ -555,7 +586,7 @@ private void ensureGuidListIsMutable() { } } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @return A list containing the guidList. */ public java.util.List @@ -564,14 +595,14 @@ private void ensureGuidListIsMutable() { java.util.Collections.unmodifiableList(guidList_) : guidList_; } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @return The count of guidList. */ public int getGuidListCount() { return guidList_.size(); } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @param index The index of the element to return. * @return The guidList at the given index. */ @@ -579,7 +610,7 @@ public long getGuidList(int index) { return guidList_.getLong(index); } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @param index The index to set the value at. * @param value The guidList to set. * @return This builder for chaining. @@ -592,7 +623,7 @@ public Builder setGuidList( return this; } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @param value The guidList to add. * @return This builder for chaining. */ @@ -603,7 +634,7 @@ public Builder addGuidList(long value) { return this; } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @param values The guidList to add. * @return This builder for chaining. */ @@ -616,7 +647,7 @@ public Builder addAllGuidList( return this; } /** - * repeated uint64 guid_list = 9; + * repeated uint64 guid_list = 13; * @return This builder for chaining. */ public Builder clearGuidList() { @@ -625,37 +656,6 @@ public Builder clearGuidList() { onChanged(); return this; } - - private int retcode_ ; - /** - * int32 retcode = 2; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 2; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 2; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -724,8 +724,8 @@ public emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomp static { java.lang.String[] descriptorData = { "\n\033ReliquaryDecomposeRsp.proto\";\n\025Reliqua" + - "ryDecomposeRsp\022\021\n\tguid_list\030\t \003(\004\022\017\n\007ret" + - "code\030\002 \001(\005B\033\n\031emu.grasscutter.net.protob" + + "ryDecomposeRsp\022\017\n\007retcode\030\001 \001(\005\022\021\n\tguid_" + + "list\030\r \003(\004B\033\n\031emu.grasscutter.net.protob" + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -737,7 +737,7 @@ public emu.grasscutter.net.proto.ReliquaryDecomposeRspOuterClass.ReliquaryDecomp internal_static_ReliquaryDecomposeRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ReliquaryDecomposeRsp_descriptor, - new java.lang.String[] { "GuidList", "Retcode", }); + new java.lang.String[] { "Retcode", "GuidList", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeReqOuterClass.java index f632fe00b0c..dcbc9c10f90 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeReqOuterClass.java @@ -19,25 +19,25 @@ public interface ReliquaryUpgradeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ java.util.List getItemParamListList(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ int getItemParamListCount(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ java.util.List getItemParamListOrBuilderList(); /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index); @@ -60,15 +60,15 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamLis long getFoodReliquaryGuidList(int index); /** - * uint64 target_reliquary_guid = 4; + * uint64 target_reliquary_guid = 11; * @return The targetReliquaryGuid. */ long getTargetReliquaryGuid(); } /** * 
-   * CmdId: 1702
-   * Obf: BNGPJOABGAC
+   * CmdId: 24032
+   * obf: IJPAJDJEBHL
    *
* * Protobuf type {@code ReliquaryUpgradeReq} @@ -139,12 +139,12 @@ private ReliquaryUpgradeReq( input.popLimit(limit); break; } - case 32: { + case 88: { targetReliquaryGuid_ = input.readUInt64(); break; } - case 122: { + case 98: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { itemParamList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -191,17 +191,17 @@ private ReliquaryUpgradeReq( emu.grasscutter.net.proto.ReliquaryUpgradeReqOuterClass.ReliquaryUpgradeReq.class, emu.grasscutter.net.proto.ReliquaryUpgradeReqOuterClass.ReliquaryUpgradeReq.Builder.class); } - public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 15; + public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 12; private java.util.List itemParamList_; /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ @java.lang.Override public java.util.List getItemParamListList() { return itemParamList_; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ @java.lang.Override public java.util.List @@ -209,21 +209,21 @@ public java.util.List g return itemParamList_; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ @java.lang.Override public int getItemParamListCount() { return itemParamList_.size(); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { return itemParamList_.get(index); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( @@ -259,10 +259,10 @@ public long getFoodReliquaryGuidList(int index) { } private int foodReliquaryGuidListMemoizedSerializedSize = -1; - public static final int TARGET_RELIQUARY_GUID_FIELD_NUMBER = 4; + public static final int TARGET_RELIQUARY_GUID_FIELD_NUMBER = 11; private long targetReliquaryGuid_; /** - * uint64 target_reliquary_guid = 4; + * uint64 target_reliquary_guid = 11; * @return The targetReliquaryGuid. */ @java.lang.Override @@ -293,10 +293,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeUInt64NoTag(foodReliquaryGuidList_.getLong(i)); } if (targetReliquaryGuid_ != 0L) { - output.writeUInt64(4, targetReliquaryGuid_); + output.writeUInt64(11, targetReliquaryGuid_); } for (int i = 0; i < itemParamList_.size(); i++) { - output.writeMessage(15, itemParamList_.get(i)); + output.writeMessage(12, itemParamList_.get(i)); } unknownFields.writeTo(output); } @@ -323,11 +323,11 @@ public int getSerializedSize() { } if (targetReliquaryGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(4, targetReliquaryGuid_); + .computeUInt64Size(11, targetReliquaryGuid_); } for (int i = 0; i < itemParamList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, itemParamList_.get(i)); + .computeMessageSize(12, itemParamList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -469,8 +469,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 1702
-     * Obf: BNGPJOABGAC
+     * CmdId: 24032
+     * obf: IJPAJDJEBHL
      *
* * Protobuf type {@code ReliquaryUpgradeReq} @@ -693,7 +693,7 @@ private void ensureItemParamListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_; /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public java.util.List getItemParamListList() { if (itemParamListBuilder_ == null) { @@ -703,7 +703,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public int getItemParamListCount() { if (itemParamListBuilder_ == null) { @@ -713,7 +713,7 @@ public int getItemParamListCount() { } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -723,7 +723,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList( } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -740,7 +740,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder setItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -754,7 +754,7 @@ public Builder setItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemParamListBuilder_ == null) { @@ -770,7 +770,7 @@ public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.It return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -787,7 +787,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder addItemParamList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -801,7 +801,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder addItemParamList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -815,7 +815,7 @@ public Builder addItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder addAllItemParamList( java.lang.Iterable values) { @@ -830,7 +830,7 @@ public Builder addAllItemParamList( return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder clearItemParamList() { if (itemParamListBuilder_ == null) { @@ -843,7 +843,7 @@ public Builder clearItemParamList() { return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public Builder removeItemParamList(int index) { if (itemParamListBuilder_ == null) { @@ -856,14 +856,14 @@ public Builder removeItemParamList(int index) { return this; } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder( int index) { return getItemParamListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder( int index) { @@ -873,7 +873,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public java.util.List getItemParamListOrBuilderList() { @@ -884,14 +884,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemP } } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() { return getItemParamListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder( int index) { @@ -899,7 +899,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemPa index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_param_list = 15; + * repeated .ItemParam item_param_list = 12; */ public java.util.List getItemParamListBuilderList() { @@ -1001,7 +1001,7 @@ public Builder clearFoodReliquaryGuidList() { private long targetReliquaryGuid_ ; /** - * uint64 target_reliquary_guid = 4; + * uint64 target_reliquary_guid = 11; * @return The targetReliquaryGuid. */ @java.lang.Override @@ -1009,7 +1009,7 @@ public long getTargetReliquaryGuid() { return targetReliquaryGuid_; } /** - * uint64 target_reliquary_guid = 4; + * uint64 target_reliquary_guid = 11; * @param value The targetReliquaryGuid to set. * @return This builder for chaining. */ @@ -1020,7 +1020,7 @@ public Builder setTargetReliquaryGuid(long value) { return this; } /** - * uint64 target_reliquary_guid = 4; + * uint64 target_reliquary_guid = 11; * @return This builder for chaining. */ public Builder clearTargetReliquaryGuid() { @@ -1098,9 +1098,9 @@ public emu.grasscutter.net.proto.ReliquaryUpgradeReqOuterClass.ReliquaryUpgradeR java.lang.String[] descriptorData = { "\n\031ReliquaryUpgradeReq.proto\032\017ItemParam.p" + "roto\"{\n\023ReliquaryUpgradeReq\022#\n\017item_para" + - "m_list\030\017 \003(\0132\n.ItemParam\022 \n\030food_reliqua" + + "m_list\030\014 \003(\0132\n.ItemParam\022 \n\030food_reliqua" + "ry_guid_list\030\002 \003(\004\022\035\n\025target_reliquary_g" + - "uid\030\004 \001(\004B\033\n\031emu.grasscutter.net.protob\006" + + "uid\030\013 \001(\004B\033\n\031emu.grasscutter.net.protob\006" + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeRspOuterClass.java index bf8d712ad1f..3fe87b41dcb 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryUpgradeRspOuterClass.java @@ -19,73 +19,97 @@ public interface ReliquaryUpgradeRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 cur_level = 13; + * uint32 cur_level = 1; * @return The curLevel. */ int getCurLevel(); /** - * uint32 power_up_rate = 11; + * uint32 old_level = 2; + * @return The oldLevel. + */ + int getOldLevel(); + + /** + * int32 retcode = 7; + * @return The retcode. + */ + int getRetcode(); + + /** + * uint64 target_reliquary_guid = 8; + * @return The targetReliquaryGuid. + */ + long getTargetReliquaryGuid(); + + /** + * uint32 power_up_rate = 10; * @return The powerUpRate. */ int getPowerUpRate(); /** - * repeated uint32 old_append_prop_list = 14; + * 
+     * 可能不对 要和下面互换
+     *
+ * + * repeated uint32 old_append_prop_list = 13; * @return A list containing the oldAppendPropList. */ java.util.List getOldAppendPropListList(); /** - * repeated uint32 old_append_prop_list = 14; + * 
+     * 可能不对 要和下面互换
+     *
+ * + * repeated uint32 old_append_prop_list = 13; * @return The count of oldAppendPropList. */ int getOldAppendPropListCount(); /** - * repeated uint32 old_append_prop_list = 14; + * 
+     * 可能不对 要和下面互换
+     *
+ * + * repeated uint32 old_append_prop_list = 13; * @param index The index of the element to return. * @return The oldAppendPropList at the given index. */ int getOldAppendPropList(int index); /** - * uint32 old_level = 8; - * @return The oldLevel. - */ - int getOldLevel(); - - /** + * 
+     * 可能不对 要和上面互换
+     *
+ * * repeated uint32 cur_append_prop_list = 15; * @return A list containing the curAppendPropList. */ java.util.List getCurAppendPropListList(); /** + * 
+     * 可能不对 要和上面互换
+     *
+ * * repeated uint32 cur_append_prop_list = 15; * @return The count of curAppendPropList. */ int getCurAppendPropListCount(); /** + * 
+     * 可能不对 要和上面互换
+     *
+ * * repeated uint32 cur_append_prop_list = 15; * @param index The index of the element to return. * @return The curAppendPropList at the given index. */ int getCurAppendPropList(int index); - - /** - * uint64 target_reliquary_guid = 5; - * @return The targetReliquaryGuid. - */ - long getTargetReliquaryGuid(); - - /** - * int32 retcode = 10; - * @return The retcode. - */ - int getRetcode(); } /** * 
-   * CmdId: 25485
-   * Obf: CAHAEBGDMKK
+   * CmdId: 20217
+   * obf: LNEDDIIKBLE
    *
* * Protobuf type {@code ReliquaryUpgradeRsp} @@ -135,32 +159,32 @@ private ReliquaryUpgradeRsp( case 0: done = true; break; - case 40: { + case 8: { - targetReliquaryGuid_ = input.readUInt64(); + curLevel_ = input.readUInt32(); break; } - case 64: { + case 16: { oldLevel_ = input.readUInt32(); break; } - case 80: { + case 56: { retcode_ = input.readInt32(); break; } - case 88: { + case 64: { - powerUpRate_ = input.readUInt32(); + targetReliquaryGuid_ = input.readUInt64(); break; } - case 104: { + case 80: { - curLevel_ = input.readUInt32(); + powerUpRate_ = input.readUInt32(); break; } - case 112: { + case 104: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { oldAppendPropList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -168,7 +192,7 @@ private ReliquaryUpgradeRsp( oldAppendPropList_.addInt(input.readUInt32()); break; } - case 114: { + case 106: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -240,10 +264,10 @@ private ReliquaryUpgradeRsp( emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass.ReliquaryUpgradeRsp.class, emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass.ReliquaryUpgradeRsp.Builder.class); } - public static final int CUR_LEVEL_FIELD_NUMBER = 13; + public static final int CUR_LEVEL_FIELD_NUMBER = 1; private int curLevel_; /** - * uint32 cur_level = 13; + * uint32 cur_level = 1; * @return The curLevel. */ @java.lang.Override @@ -251,10 +275,43 @@ public int getCurLevel() { return curLevel_; } - public static final int POWER_UP_RATE_FIELD_NUMBER = 11; + public static final int OLD_LEVEL_FIELD_NUMBER = 2; + private int oldLevel_; + /** + * uint32 old_level = 2; + * @return The oldLevel. + */ + @java.lang.Override + public int getOldLevel() { + return oldLevel_; + } + + public static final int RETCODE_FIELD_NUMBER = 7; + private int retcode_; + /** + * int32 retcode = 7; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int TARGET_RELIQUARY_GUID_FIELD_NUMBER = 8; + private long targetReliquaryGuid_; + /** + * uint64 target_reliquary_guid = 8; + * @return The targetReliquaryGuid. + */ + @java.lang.Override + public long getTargetReliquaryGuid() { + return targetReliquaryGuid_; + } + + public static final int POWER_UP_RATE_FIELD_NUMBER = 10; private int powerUpRate_; /** - * uint32 power_up_rate = 11; + * uint32 power_up_rate = 10; * @return The powerUpRate. */ @java.lang.Override @@ -262,10 +319,14 @@ public int getPowerUpRate() { return powerUpRate_; } - public static final int OLD_APPEND_PROP_LIST_FIELD_NUMBER = 14; + public static final int OLD_APPEND_PROP_LIST_FIELD_NUMBER = 13; private com.google.protobuf.Internal.IntList oldAppendPropList_; /** - * repeated uint32 old_append_prop_list = 14; + * 
+     * 可能不对 要和下面互换
+     *
+ * + * repeated uint32 old_append_prop_list = 13; * @return A list containing the oldAppendPropList. */ @java.lang.Override @@ -274,14 +335,22 @@ public int getPowerUpRate() { return oldAppendPropList_; } /** - * repeated uint32 old_append_prop_list = 14; + * 
+     * 可能不对 要和下面互换
+     *
+ * + * repeated uint32 old_append_prop_list = 13; * @return The count of oldAppendPropList. */ public int getOldAppendPropListCount() { return oldAppendPropList_.size(); } /** - * repeated uint32 old_append_prop_list = 14; + * 
+     * 可能不对 要和下面互换
+     *
+ * + * repeated uint32 old_append_prop_list = 13; * @param index The index of the element to return. * @return The oldAppendPropList at the given index. */ @@ -290,20 +359,13 @@ public int getOldAppendPropList(int index) { } private int oldAppendPropListMemoizedSerializedSize = -1; - public static final int OLD_LEVEL_FIELD_NUMBER = 8; - private int oldLevel_; - /** - * uint32 old_level = 8; - * @return The oldLevel. - */ - @java.lang.Override - public int getOldLevel() { - return oldLevel_; - } - public static final int CUR_APPEND_PROP_LIST_FIELD_NUMBER = 15; private com.google.protobuf.Internal.IntList curAppendPropList_; /** + * 
+     * 可能不对 要和上面互换
+     *
+ * * repeated uint32 cur_append_prop_list = 15; * @return A list containing the curAppendPropList. */ @@ -313,6 +375,10 @@ public int getOldLevel() { return curAppendPropList_; } /** + * 
+     * 可能不对 要和上面互换
+     *
+ * * repeated uint32 cur_append_prop_list = 15; * @return The count of curAppendPropList. */ @@ -320,6 +386,10 @@ public int getCurAppendPropListCount() { return curAppendPropList_.size(); } /** + * 
+     * 可能不对 要和上面互换
+     *
+ * * repeated uint32 cur_append_prop_list = 15; * @param index The index of the element to return. * @return The curAppendPropList at the given index. @@ -329,28 +399,6 @@ public int getCurAppendPropList(int index) { } private int curAppendPropListMemoizedSerializedSize = -1; - public static final int TARGET_RELIQUARY_GUID_FIELD_NUMBER = 5; - private long targetReliquaryGuid_; - /** - * uint64 target_reliquary_guid = 5; - * @return The targetReliquaryGuid. - */ - @java.lang.Override - public long getTargetReliquaryGuid() { - return targetReliquaryGuid_; - } - - public static final int RETCODE_FIELD_NUMBER = 10; - private int retcode_; - /** - * int32 retcode = 10; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -366,23 +414,23 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (targetReliquaryGuid_ != 0L) { - output.writeUInt64(5, targetReliquaryGuid_); + if (curLevel_ != 0) { + output.writeUInt32(1, curLevel_); } if (oldLevel_ != 0) { - output.writeUInt32(8, oldLevel_); + output.writeUInt32(2, oldLevel_); } if (retcode_ != 0) { - output.writeInt32(10, retcode_); + output.writeInt32(7, retcode_); } - if (powerUpRate_ != 0) { - output.writeUInt32(11, powerUpRate_); + if (targetReliquaryGuid_ != 0L) { + output.writeUInt64(8, targetReliquaryGuid_); } - if (curLevel_ != 0) { - output.writeUInt32(13, curLevel_); + if (powerUpRate_ != 0) { + output.writeUInt32(10, powerUpRate_); } if (getOldAppendPropListList().size() > 0) { - output.writeUInt32NoTag(114); + output.writeUInt32NoTag(106); output.writeUInt32NoTag(oldAppendPropListMemoizedSerializedSize); } for (int i = 0; i < oldAppendPropList_.size(); i++) { @@ -404,25 +452,25 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (targetReliquaryGuid_ != 0L) { + if (curLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(5, targetReliquaryGuid_); + .computeUInt32Size(1, curLevel_); } if (oldLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, oldLevel_); + .computeUInt32Size(2, oldLevel_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, retcode_); + .computeInt32Size(7, retcode_); } - if (powerUpRate_ != 0) { + if (targetReliquaryGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, powerUpRate_); + .computeUInt64Size(8, targetReliquaryGuid_); } - if (curLevel_ != 0) { + if (powerUpRate_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, curLevel_); + .computeUInt32Size(10, powerUpRate_); } { int dataSize = 0; @@ -469,18 +517,18 @@ public boolean equals(final java.lang.Object obj) { if (getCurLevel() != other.getCurLevel()) return false; + if (getOldLevel() + != other.getOldLevel()) return false; + if (getRetcode() + != other.getRetcode()) return false; + if (getTargetReliquaryGuid() + != other.getTargetReliquaryGuid()) return false; if (getPowerUpRate() != other.getPowerUpRate()) return false; if (!getOldAppendPropListList() .equals(other.getOldAppendPropListList())) return false; - if (getOldLevel() - != other.getOldLevel()) return false; if (!getCurAppendPropListList() .equals(other.getCurAppendPropListList())) return false; - if (getTargetReliquaryGuid() - != other.getTargetReliquaryGuid()) return false; - if (getRetcode() - != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -494,23 +542,23 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER; hash = (53 * hash) + getCurLevel(); + hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getOldLevel(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + TARGET_RELIQUARY_GUID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getTargetReliquaryGuid()); hash = (37 * hash) + POWER_UP_RATE_FIELD_NUMBER; hash = (53 * hash) + getPowerUpRate(); if (getOldAppendPropListCount() > 0) { hash = (37 * hash) + OLD_APPEND_PROP_LIST_FIELD_NUMBER; hash = (53 * hash) + getOldAppendPropListList().hashCode(); } - hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getOldLevel(); if (getCurAppendPropListCount() > 0) { hash = (37 * hash) + CUR_APPEND_PROP_LIST_FIELD_NUMBER; hash = (53 * hash) + getCurAppendPropListList().hashCode(); } - hash = (37 * hash) + TARGET_RELIQUARY_GUID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getTargetReliquaryGuid()); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -608,8 +656,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25485
-     * Obf: CAHAEBGDMKK
+     * CmdId: 20217
+     * obf: LNEDDIIKBLE
      *
* * Protobuf type {@code ReliquaryUpgradeRsp} @@ -651,18 +699,18 @@ public Builder clear() { super.clear(); curLevel_ = 0; + oldLevel_ = 0; + + retcode_ = 0; + + targetReliquaryGuid_ = 0L; + powerUpRate_ = 0; oldAppendPropList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - oldLevel_ = 0; - curAppendPropList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); - targetReliquaryGuid_ = 0L; - - retcode_ = 0; - return this; } @@ -691,20 +739,20 @@ public emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass.ReliquaryUpgradeR emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass.ReliquaryUpgradeRsp result = new emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass.ReliquaryUpgradeRsp(this); int from_bitField0_ = bitField0_; result.curLevel_ = curLevel_; + result.oldLevel_ = oldLevel_; + result.retcode_ = retcode_; + result.targetReliquaryGuid_ = targetReliquaryGuid_; result.powerUpRate_ = powerUpRate_; if (((bitField0_ & 0x00000001) != 0)) { oldAppendPropList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.oldAppendPropList_ = oldAppendPropList_; - result.oldLevel_ = oldLevel_; if (((bitField0_ & 0x00000002) != 0)) { curAppendPropList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.curAppendPropList_ = curAppendPropList_; - result.targetReliquaryGuid_ = targetReliquaryGuid_; - result.retcode_ = retcode_; onBuilt(); return result; } @@ -756,6 +804,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass if (other.getCurLevel() != 0) { setCurLevel(other.getCurLevel()); } + if (other.getOldLevel() != 0) { + setOldLevel(other.getOldLevel()); + } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } + if (other.getTargetReliquaryGuid() != 0L) { + setTargetReliquaryGuid(other.getTargetReliquaryGuid()); + } if (other.getPowerUpRate() != 0) { setPowerUpRate(other.getPowerUpRate()); } @@ -769,9 +826,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass } onChanged(); } - if (other.getOldLevel() != 0) { - setOldLevel(other.getOldLevel()); - } if (!other.curAppendPropList_.isEmpty()) { if (curAppendPropList_.isEmpty()) { curAppendPropList_ = other.curAppendPropList_; @@ -782,12 +836,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass } onChanged(); } - if (other.getTargetReliquaryGuid() != 0L) { - setTargetReliquaryGuid(other.getTargetReliquaryGuid()); - } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -820,7 +868,7 @@ public Builder mergeFrom( private int curLevel_ ; /** - * uint32 cur_level = 13; + * uint32 cur_level = 1; * @return The curLevel. */ @java.lang.Override @@ -828,7 +876,7 @@ public int getCurLevel() { return curLevel_; } /** - * uint32 cur_level = 13; + * uint32 cur_level = 1; * @param value The curLevel to set. * @return This builder for chaining. */ @@ -839,7 +887,7 @@ public Builder setCurLevel(int value) { return this; } /** - * uint32 cur_level = 13; + * uint32 cur_level = 1; * @return This builder for chaining. */ public Builder clearCurLevel() { @@ -849,9 +897,102 @@ public Builder clearCurLevel() { return this; } + private int oldLevel_ ; + /** + * uint32 old_level = 2; + * @return The oldLevel. + */ + @java.lang.Override + public int getOldLevel() { + return oldLevel_; + } + /** + * uint32 old_level = 2; + * @param value The oldLevel to set. + * @return This builder for chaining. + */ + public Builder setOldLevel(int value) { + + oldLevel_ = value; + onChanged(); + return this; + } + /** + * uint32 old_level = 2; + * @return This builder for chaining. + */ + public Builder clearOldLevel() { + + oldLevel_ = 0; + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 7; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 7; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 7; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + + private long targetReliquaryGuid_ ; + /** + * uint64 target_reliquary_guid = 8; + * @return The targetReliquaryGuid. + */ + @java.lang.Override + public long getTargetReliquaryGuid() { + return targetReliquaryGuid_; + } + /** + * uint64 target_reliquary_guid = 8; + * @param value The targetReliquaryGuid to set. + * @return This builder for chaining. + */ + public Builder setTargetReliquaryGuid(long value) { + + targetReliquaryGuid_ = value; + onChanged(); + return this; + } + /** + * uint64 target_reliquary_guid = 8; + * @return This builder for chaining. + */ + public Builder clearTargetReliquaryGuid() { + + targetReliquaryGuid_ = 0L; + onChanged(); + return this; + } + private int powerUpRate_ ; /** - * uint32 power_up_rate = 11; + * uint32 power_up_rate = 10; * @return The powerUpRate. */ @java.lang.Override @@ -859,7 +1000,7 @@ public int getPowerUpRate() { return powerUpRate_; } /** - * uint32 power_up_rate = 11; + * uint32 power_up_rate = 10; * @param value The powerUpRate to set. * @return This builder for chaining. */ @@ -870,7 +1011,7 @@ public Builder setPowerUpRate(int value) { return this; } /** - * uint32 power_up_rate = 11; + * uint32 power_up_rate = 10; * @return This builder for chaining. */ public Builder clearPowerUpRate() { @@ -888,7 +1029,11 @@ private void ensureOldAppendPropListIsMutable() { } } /** - * repeated uint32 old_append_prop_list = 14; + * 
+       * 可能不对 要和下面互换
+       *
+ * + * repeated uint32 old_append_prop_list = 13; * @return A list containing the oldAppendPropList. */ public java.util.List @@ -897,14 +1042,22 @@ private void ensureOldAppendPropListIsMutable() { java.util.Collections.unmodifiableList(oldAppendPropList_) : oldAppendPropList_; } /** - * repeated uint32 old_append_prop_list = 14; + * 
+       * 可能不对 要和下面互换
+       *
+ * + * repeated uint32 old_append_prop_list = 13; * @return The count of oldAppendPropList. */ public int getOldAppendPropListCount() { return oldAppendPropList_.size(); } /** - * repeated uint32 old_append_prop_list = 14; + * 
+       * 可能不对 要和下面互换
+       *
+ * + * repeated uint32 old_append_prop_list = 13; * @param index The index of the element to return. * @return The oldAppendPropList at the given index. */ @@ -912,7 +1065,11 @@ public int getOldAppendPropList(int index) { return oldAppendPropList_.getInt(index); } /** - * repeated uint32 old_append_prop_list = 14; + * 
+       * 可能不对 要和下面互换
+       *
+ * + * repeated uint32 old_append_prop_list = 13; * @param index The index to set the value at. * @param value The oldAppendPropList to set. * @return This builder for chaining. @@ -925,7 +1082,11 @@ public Builder setOldAppendPropList( return this; } /** - * repeated uint32 old_append_prop_list = 14; + * 
+       * 可能不对 要和下面互换
+       *
+ * + * repeated uint32 old_append_prop_list = 13; * @param value The oldAppendPropList to add. * @return This builder for chaining. */ @@ -936,7 +1097,11 @@ public Builder addOldAppendPropList(int value) { return this; } /** - * repeated uint32 old_append_prop_list = 14; + * 
+       * 可能不对 要和下面互换
+       *
+ * + * repeated uint32 old_append_prop_list = 13; * @param values The oldAppendPropList to add. * @return This builder for chaining. */ @@ -949,7 +1114,11 @@ public Builder addAllOldAppendPropList( return this; } /** - * repeated uint32 old_append_prop_list = 14; + * 
+       * 可能不对 要和下面互换
+       *
+ * + * repeated uint32 old_append_prop_list = 13; * @return This builder for chaining. */ public Builder clearOldAppendPropList() { @@ -959,37 +1128,6 @@ public Builder clearOldAppendPropList() { return this; } - private int oldLevel_ ; - /** - * uint32 old_level = 8; - * @return The oldLevel. - */ - @java.lang.Override - public int getOldLevel() { - return oldLevel_; - } - /** - * uint32 old_level = 8; - * @param value The oldLevel to set. - * @return This builder for chaining. - */ - public Builder setOldLevel(int value) { - - oldLevel_ = value; - onChanged(); - return this; - } - /** - * uint32 old_level = 8; - * @return This builder for chaining. - */ - public Builder clearOldLevel() { - - oldLevel_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.Internal.IntList curAppendPropList_ = emptyIntList(); private void ensureCurAppendPropListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { @@ -998,6 +1136,10 @@ private void ensureCurAppendPropListIsMutable() { } } /** + * 
+       * 可能不对 要和上面互换
+       *
+ * * repeated uint32 cur_append_prop_list = 15; * @return A list containing the curAppendPropList. */ @@ -1007,6 +1149,10 @@ private void ensureCurAppendPropListIsMutable() { java.util.Collections.unmodifiableList(curAppendPropList_) : curAppendPropList_; } /** + * 
+       * 可能不对 要和上面互换
+       *
+ * * repeated uint32 cur_append_prop_list = 15; * @return The count of curAppendPropList. */ @@ -1014,6 +1160,10 @@ public int getCurAppendPropListCount() { return curAppendPropList_.size(); } /** + * 
+       * 可能不对 要和上面互换
+       *
+ * * repeated uint32 cur_append_prop_list = 15; * @param index The index of the element to return. * @return The curAppendPropList at the given index. @@ -1022,6 +1172,10 @@ public int getCurAppendPropList(int index) { return curAppendPropList_.getInt(index); } /** + * 
+       * 可能不对 要和上面互换
+       *
+ * * repeated uint32 cur_append_prop_list = 15; * @param index The index to set the value at. * @param value The curAppendPropList to set. @@ -1035,6 +1189,10 @@ public Builder setCurAppendPropList( return this; } /** + * 
+       * 可能不对 要和上面互换
+       *
+ * * repeated uint32 cur_append_prop_list = 15; * @param value The curAppendPropList to add. * @return This builder for chaining. @@ -1046,6 +1204,10 @@ public Builder addCurAppendPropList(int value) { return this; } /** + * 
+       * 可能不对 要和上面互换
+       *
+ * * repeated uint32 cur_append_prop_list = 15; * @param values The curAppendPropList to add. * @return This builder for chaining. @@ -1059,6 +1221,10 @@ public Builder addAllCurAppendPropList( return this; } /** + * 
+       * 可能不对 要和上面互换
+       *
+ * * repeated uint32 cur_append_prop_list = 15; * @return This builder for chaining. */ @@ -1068,68 +1234,6 @@ public Builder clearCurAppendPropList() { onChanged(); return this; } - - private long targetReliquaryGuid_ ; - /** - * uint64 target_reliquary_guid = 5; - * @return The targetReliquaryGuid. - */ - @java.lang.Override - public long getTargetReliquaryGuid() { - return targetReliquaryGuid_; - } - /** - * uint64 target_reliquary_guid = 5; - * @param value The targetReliquaryGuid to set. - * @return This builder for chaining. - */ - public Builder setTargetReliquaryGuid(long value) { - - targetReliquaryGuid_ = value; - onChanged(); - return this; - } - /** - * uint64 target_reliquary_guid = 5; - * @return This builder for chaining. - */ - public Builder clearTargetReliquaryGuid() { - - targetReliquaryGuid_ = 0L; - onChanged(); - return this; - } - - private int retcode_ ; - /** - * int32 retcode = 10; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 10; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 10; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1198,11 +1302,11 @@ public emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass.ReliquaryUpgradeR static { java.lang.String[] descriptorData = { "\n\031ReliquaryUpgradeRsp.proto\"\276\001\n\023Reliquar" + - "yUpgradeRsp\022\021\n\tcur_level\030\r \001(\r\022\025\n\rpower_" + - "up_rate\030\013 \001(\r\022\034\n\024old_append_prop_list\030\016 " + - "\003(\r\022\021\n\told_level\030\010 \001(\r\022\034\n\024cur_append_pro" + - "p_list\030\017 \003(\r\022\035\n\025target_reliquary_guid\030\005 " + - "\001(\004\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.grasscutter." + + "yUpgradeRsp\022\021\n\tcur_level\030\001 \001(\r\022\021\n\told_le" + + "vel\030\002 \001(\r\022\017\n\007retcode\030\007 \001(\005\022\035\n\025target_rel" + + "iquary_guid\030\010 \001(\004\022\025\n\rpower_up_rate\030\n \001(\r" + + "\022\034\n\024old_append_prop_list\030\r \003(\r\022\034\n\024cur_ap" + + "pend_prop_list\030\017 \003(\rB\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1214,7 +1318,7 @@ public emu.grasscutter.net.proto.ReliquaryUpgradeRspOuterClass.ReliquaryUpgradeR internal_static_ReliquaryUpgradeRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ReliquaryUpgradeRsp_descriptor, - new java.lang.String[] { "CurLevel", "PowerUpRate", "OldAppendPropList", "OldLevel", "CurAppendPropList", "TargetReliquaryGuid", "Retcode", }); + new java.lang.String[] { "CurLevel", "OldLevel", "Retcode", "TargetReliquaryGuid", "PowerUpRate", "OldAppendPropList", "CurAppendPropList", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RoguelikeDungeonSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RoguelikeDungeonSettleInfoOuterClass.java index e6ba2db8f8a..8b2ebb2c11a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/RoguelikeDungeonSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/RoguelikeDungeonSettleInfoOuterClass.java @@ -19,80 +19,76 @@ public interface RoguelikeDungeonSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 stage_id = 12; - * @return The stageId. + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ - int getStageId(); - - /** - * uint32 cur_level = 15; - * @return The curLevel. - */ - int getCurLevel(); - + int getCDNIIBLIFIICount(); /** - * uint32 POLCMMBAENP = 7; - * @return The pOLCMMBAENP. + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ - int getPOLCMMBAENP(); - - /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; - */ - int getFinishedChallengeCellNumMapCount(); - /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; - */ - boolean containsFinishedChallengeCellNumMap( + boolean containsCDNIIBLIFII( int key); /** - * Use {@link #getFinishedChallengeCellNumMapMap()} instead. + * Use {@link #getCDNIIBLIFIIMap()} instead. */ @java.lang.Deprecated java.util.Map - getFinishedChallengeCellNumMap(); + getCDNIIBLIFII(); /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ java.util.Map - getFinishedChallengeCellNumMapMap(); + getCDNIIBLIFIIMap(); /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ - emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getFinishedChallengeCellNumMapOrDefault( + emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getCDNIIBLIFIIOrDefault( int key, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo defaultValue); /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ - emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getFinishedChallengeCellNumMapOrThrow( + emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getCDNIIBLIFIIOrThrow( int key); /** - * bool FNMECPGDCBD = 4; - * @return The fNMECPGDCBD. + * uint32 HBINBDBMOED = 2; + * @return The hBINBDBMOED. + */ + int getHBINBDBMOED(); + + /** + * bool PKOELLIPBHP = 3; + * @return The pKOELLIPBHP. + */ + boolean getPKOELLIPBHP(); + + /** + * uint32 ELHPDAEIMPJ = 4; + * @return The eLHPDAEIMPJ. + */ + int getELHPDAEIMPJ(); + + /** + * uint32 cur_level = 6; + * @return The curLevel. */ - boolean getFNMECPGDCBD(); + int getCurLevel(); /** - * bool PDJEIMCPECJ = 10; - * @return The pDJEIMCPECJ. + * uint32 MEMPKCGNNMF = 10; + * @return The mEMPKCGNNMF. */ - boolean getPDJEIMCPECJ(); + int getMEMPKCGNNMF(); /** - * uint32 FOCELGIAFLM = 9; - * @return The fOCELGIAFLM. + * bool CMFPJHFFHBI = 14; + * @return The cMFPJHFFHBI. */ - int getFOCELGIAFLM(); + boolean getCMFPJHFFHBI(); } /** - * 
-   * Obf: EBKDFPPIOCD
-   *
- * * Protobuf type {@code RoguelikeDungeonSettleInfo} */ public static final class RoguelikeDungeonSettleInfo extends @@ -138,47 +134,47 @@ private RoguelikeDungeonSettleInfo( case 0: done = true; break; - case 32: { - - fNMECPGDCBD_ = input.readBool(); + case 10: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + cDNIIBLIFII_ = com.google.protobuf.MapField.newMapField( + CDNIIBLIFIIDefaultEntryHolder.defaultEntry); + mutable_bitField0_ |= 0x00000001; + } + com.google.protobuf.MapEntry + cDNIIBLIFII__ = input.readMessage( + CDNIIBLIFIIDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + cDNIIBLIFII_.getMutableMap().put( + cDNIIBLIFII__.getKey(), cDNIIBLIFII__.getValue()); break; } - case 56: { + case 16: { - pOLCMMBAENP_ = input.readUInt32(); + hBINBDBMOED_ = input.readUInt32(); break; } - case 72: { + case 24: { - fOCELGIAFLM_ = input.readUInt32(); + pKOELLIPBHP_ = input.readBool(); break; } - case 80: { + case 32: { - pDJEIMCPECJ_ = input.readBool(); + eLHPDAEIMPJ_ = input.readUInt32(); break; } - case 90: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - finishedChallengeCellNumMap_ = com.google.protobuf.MapField.newMapField( - FinishedChallengeCellNumMapDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000001; - } - com.google.protobuf.MapEntry - finishedChallengeCellNumMap__ = input.readMessage( - FinishedChallengeCellNumMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - finishedChallengeCellNumMap_.getMutableMap().put( - finishedChallengeCellNumMap__.getKey(), finishedChallengeCellNumMap__.getValue()); + case 48: { + + curLevel_ = input.readUInt32(); break; } - case 96: { + case 80: { - stageId_ = input.readUInt32(); + mEMPKCGNNMF_ = input.readUInt32(); break; } - case 120: { + case 112: { - curLevel_ = input.readUInt32(); + cMFPJHFFHBI_ = input.readBool(); break; } default: { @@ -210,8 +206,8 @@ private RoguelikeDungeonSettleInfo( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 11: - return internalGetFinishedChallengeCellNumMap(); + case 1: + return internalGetCDNIIBLIFII(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -225,151 +221,151 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.class, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder.class); } - public static final int STAGE_ID_FIELD_NUMBER = 12; - private int stageId_; - /** - * uint32 stage_id = 12; - * @return The stageId. - */ - @java.lang.Override - public int getStageId() { - return stageId_; - } - - public static final int CUR_LEVEL_FIELD_NUMBER = 15; - private int curLevel_; - /** - * uint32 cur_level = 15; - * @return The curLevel. - */ - @java.lang.Override - public int getCurLevel() { - return curLevel_; - } - - public static final int POLCMMBAENP_FIELD_NUMBER = 7; - private int pOLCMMBAENP_; - /** - * uint32 POLCMMBAENP = 7; - * @return The pOLCMMBAENP. - */ - @java.lang.Override - public int getPOLCMMBAENP() { - return pOLCMMBAENP_; - } - - public static final int FINISHED_CHALLENGE_CELL_NUM_MAP_FIELD_NUMBER = 11; - private static final class FinishedChallengeCellNumMapDefaultEntryHolder { + public static final int CDNIIBLIFII_FIELD_NUMBER = 1; + private static final class CDNIIBLIFIIDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo> defaultEntry = com.google.protobuf.MapEntry .newDefaultInstance( - emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.internal_static_RoguelikeDungeonSettleInfo_FinishedChallengeCellNumMapEntry_descriptor, + emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.internal_static_RoguelikeDungeonSettleInfo_CDNIIBLIFIIEntry_descriptor, com.google.protobuf.WireFormat.FieldType.UINT32, 0, com.google.protobuf.WireFormat.FieldType.MESSAGE, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo.getDefaultInstance()); } private com.google.protobuf.MapField< - java.lang.Integer, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo> finishedChallengeCellNumMap_; + java.lang.Integer, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo> cDNIIBLIFII_; private com.google.protobuf.MapField - internalGetFinishedChallengeCellNumMap() { - if (finishedChallengeCellNumMap_ == null) { + internalGetCDNIIBLIFII() { + if (cDNIIBLIFII_ == null) { return com.google.protobuf.MapField.emptyMapField( - FinishedChallengeCellNumMapDefaultEntryHolder.defaultEntry); + CDNIIBLIFIIDefaultEntryHolder.defaultEntry); } - return finishedChallengeCellNumMap_; + return cDNIIBLIFII_; } - public int getFinishedChallengeCellNumMapCount() { - return internalGetFinishedChallengeCellNumMap().getMap().size(); + public int getCDNIIBLIFIICount() { + return internalGetCDNIIBLIFII().getMap().size(); } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ @java.lang.Override - public boolean containsFinishedChallengeCellNumMap( + public boolean containsCDNIIBLIFII( int key) { - return internalGetFinishedChallengeCellNumMap().getMap().containsKey(key); + return internalGetCDNIIBLIFII().getMap().containsKey(key); } /** - * Use {@link #getFinishedChallengeCellNumMapMap()} instead. + * Use {@link #getCDNIIBLIFIIMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getFinishedChallengeCellNumMap() { - return getFinishedChallengeCellNumMapMap(); + public java.util.Map getCDNIIBLIFII() { + return getCDNIIBLIFIIMap(); } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ @java.lang.Override - public java.util.Map getFinishedChallengeCellNumMapMap() { - return internalGetFinishedChallengeCellNumMap().getMap(); + public java.util.Map getCDNIIBLIFIIMap() { + return internalGetCDNIIBLIFII().getMap(); } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ @java.lang.Override - public emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getFinishedChallengeCellNumMapOrDefault( + public emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getCDNIIBLIFIIOrDefault( int key, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo defaultValue) { java.util.Map map = - internalGetFinishedChallengeCellNumMap().getMap(); + internalGetCDNIIBLIFII().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ @java.lang.Override - public emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getFinishedChallengeCellNumMapOrThrow( + public emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getCDNIIBLIFIIOrThrow( int key) { java.util.Map map = - internalGetFinishedChallengeCellNumMap().getMap(); + internalGetCDNIIBLIFII().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public static final int FNMECPGDCBD_FIELD_NUMBER = 4; - private boolean fNMECPGDCBD_; + public static final int HBINBDBMOED_FIELD_NUMBER = 2; + private int hBINBDBMOED_; /** - * bool FNMECPGDCBD = 4; - * @return The fNMECPGDCBD. + * uint32 HBINBDBMOED = 2; + * @return The hBINBDBMOED. */ @java.lang.Override - public boolean getFNMECPGDCBD() { - return fNMECPGDCBD_; + public int getHBINBDBMOED() { + return hBINBDBMOED_; } - public static final int PDJEIMCPECJ_FIELD_NUMBER = 10; - private boolean pDJEIMCPECJ_; + public static final int PKOELLIPBHP_FIELD_NUMBER = 3; + private boolean pKOELLIPBHP_; /** - * bool PDJEIMCPECJ = 10; - * @return The pDJEIMCPECJ. + * bool PKOELLIPBHP = 3; + * @return The pKOELLIPBHP. */ @java.lang.Override - public boolean getPDJEIMCPECJ() { - return pDJEIMCPECJ_; + public boolean getPKOELLIPBHP() { + return pKOELLIPBHP_; } - public static final int FOCELGIAFLM_FIELD_NUMBER = 9; - private int fOCELGIAFLM_; + public static final int ELHPDAEIMPJ_FIELD_NUMBER = 4; + private int eLHPDAEIMPJ_; /** - * uint32 FOCELGIAFLM = 9; - * @return The fOCELGIAFLM. + * uint32 ELHPDAEIMPJ = 4; + * @return The eLHPDAEIMPJ. */ @java.lang.Override - public int getFOCELGIAFLM() { - return fOCELGIAFLM_; + public int getELHPDAEIMPJ() { + return eLHPDAEIMPJ_; + } + + public static final int CUR_LEVEL_FIELD_NUMBER = 6; + private int curLevel_; + /** + * uint32 cur_level = 6; + * @return The curLevel. + */ + @java.lang.Override + public int getCurLevel() { + return curLevel_; + } + + public static final int MEMPKCGNNMF_FIELD_NUMBER = 10; + private int mEMPKCGNNMF_; + /** + * uint32 MEMPKCGNNMF = 10; + * @return The mEMPKCGNNMF. + */ + @java.lang.Override + public int getMEMPKCGNNMF() { + return mEMPKCGNNMF_; + } + + public static final int CMFPJHFFHBI_FIELD_NUMBER = 14; + private boolean cMFPJHFFHBI_; + /** + * bool CMFPJHFFHBI = 14; + * @return The cMFPJHFFHBI. + */ + @java.lang.Override + public boolean getCMFPJHFFHBI() { + return cMFPJHFFHBI_; } private byte memoizedIsInitialized = -1; @@ -386,29 +382,29 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (fNMECPGDCBD_ != false) { - output.writeBool(4, fNMECPGDCBD_); - } - if (pOLCMMBAENP_ != 0) { - output.writeUInt32(7, pOLCMMBAENP_); - } - if (fOCELGIAFLM_ != 0) { - output.writeUInt32(9, fOCELGIAFLM_); - } - if (pDJEIMCPECJ_ != false) { - output.writeBool(10, pDJEIMCPECJ_); - } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, - internalGetFinishedChallengeCellNumMap(), - FinishedChallengeCellNumMapDefaultEntryHolder.defaultEntry, - 11); - if (stageId_ != 0) { - output.writeUInt32(12, stageId_); + internalGetCDNIIBLIFII(), + CDNIIBLIFIIDefaultEntryHolder.defaultEntry, + 1); + if (hBINBDBMOED_ != 0) { + output.writeUInt32(2, hBINBDBMOED_); + } + if (pKOELLIPBHP_ != false) { + output.writeBool(3, pKOELLIPBHP_); + } + if (eLHPDAEIMPJ_ != 0) { + output.writeUInt32(4, eLHPDAEIMPJ_); } if (curLevel_ != 0) { - output.writeUInt32(15, curLevel_); + output.writeUInt32(6, curLevel_); + } + if (mEMPKCGNNMF_ != 0) { + output.writeUInt32(10, mEMPKCGNNMF_); + } + if (cMFPJHFFHBI_ != false) { + output.writeBool(14, cMFPJHFFHBI_); } unknownFields.writeTo(output); } @@ -419,39 +415,39 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (fNMECPGDCBD_ != false) { + for (java.util.Map.Entry entry + : internalGetCDNIIBLIFII().getMap().entrySet()) { + com.google.protobuf.MapEntry + cDNIIBLIFII__ = CDNIIBLIFIIDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, fNMECPGDCBD_); + .computeMessageSize(1, cDNIIBLIFII__); } - if (pOLCMMBAENP_ != 0) { + if (hBINBDBMOED_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, pOLCMMBAENP_); + .computeUInt32Size(2, hBINBDBMOED_); } - if (fOCELGIAFLM_ != 0) { + if (pKOELLIPBHP_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, fOCELGIAFLM_); + .computeBoolSize(3, pKOELLIPBHP_); } - if (pDJEIMCPECJ_ != false) { + if (eLHPDAEIMPJ_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(10, pDJEIMCPECJ_); + .computeUInt32Size(4, eLHPDAEIMPJ_); } - for (java.util.Map.Entry entry - : internalGetFinishedChallengeCellNumMap().getMap().entrySet()) { - com.google.protobuf.MapEntry - finishedChallengeCellNumMap__ = FinishedChallengeCellNumMapDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + if (curLevel_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, finishedChallengeCellNumMap__); + .computeUInt32Size(6, curLevel_); } - if (stageId_ != 0) { + if (mEMPKCGNNMF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, stageId_); + .computeUInt32Size(10, mEMPKCGNNMF_); } - if (curLevel_ != 0) { + if (cMFPJHFFHBI_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, curLevel_); + .computeBoolSize(14, cMFPJHFFHBI_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -468,20 +464,20 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo other = (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) obj; - if (getStageId() - != other.getStageId()) return false; + if (!internalGetCDNIIBLIFII().equals( + other.internalGetCDNIIBLIFII())) return false; + if (getHBINBDBMOED() + != other.getHBINBDBMOED()) return false; + if (getPKOELLIPBHP() + != other.getPKOELLIPBHP()) return false; + if (getELHPDAEIMPJ() + != other.getELHPDAEIMPJ()) return false; if (getCurLevel() != other.getCurLevel()) return false; - if (getPOLCMMBAENP() - != other.getPOLCMMBAENP()) return false; - if (!internalGetFinishedChallengeCellNumMap().equals( - other.internalGetFinishedChallengeCellNumMap())) return false; - if (getFNMECPGDCBD() - != other.getFNMECPGDCBD()) return false; - if (getPDJEIMCPECJ() - != other.getPDJEIMCPECJ()) return false; - if (getFOCELGIAFLM() - != other.getFOCELGIAFLM()) return false; + if (getMEMPKCGNNMF() + != other.getMEMPKCGNNMF()) return false; + if (getCMFPJHFFHBI() + != other.getCMFPJHFFHBI()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -493,24 +489,24 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + STAGE_ID_FIELD_NUMBER; - hash = (53 * hash) + getStageId(); - hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getCurLevel(); - hash = (37 * hash) + POLCMMBAENP_FIELD_NUMBER; - hash = (53 * hash) + getPOLCMMBAENP(); - if (!internalGetFinishedChallengeCellNumMap().getMap().isEmpty()) { - hash = (37 * hash) + FINISHED_CHALLENGE_CELL_NUM_MAP_FIELD_NUMBER; - hash = (53 * hash) + internalGetFinishedChallengeCellNumMap().hashCode(); + if (!internalGetCDNIIBLIFII().getMap().isEmpty()) { + hash = (37 * hash) + CDNIIBLIFII_FIELD_NUMBER; + hash = (53 * hash) + internalGetCDNIIBLIFII().hashCode(); } - hash = (37 * hash) + FNMECPGDCBD_FIELD_NUMBER; + hash = (37 * hash) + HBINBDBMOED_FIELD_NUMBER; + hash = (53 * hash) + getHBINBDBMOED(); + hash = (37 * hash) + PKOELLIPBHP_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getFNMECPGDCBD()); - hash = (37 * hash) + PDJEIMCPECJ_FIELD_NUMBER; + getPKOELLIPBHP()); + hash = (37 * hash) + ELHPDAEIMPJ_FIELD_NUMBER; + hash = (53 * hash) + getELHPDAEIMPJ(); + hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getCurLevel(); + hash = (37 * hash) + MEMPKCGNNMF_FIELD_NUMBER; + hash = (53 * hash) + getMEMPKCGNNMF(); + hash = (37 * hash) + CMFPJHFFHBI_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getPDJEIMCPECJ()); - hash = (37 * hash) + FOCELGIAFLM_FIELD_NUMBER; - hash = (53 * hash) + getFOCELGIAFLM(); + getCMFPJHFFHBI()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -607,10 +603,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: EBKDFPPIOCD
-     *
- * * Protobuf type {@code RoguelikeDungeonSettleInfo} */ public static final class Builder extends @@ -626,8 +618,8 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 11: - return internalGetFinishedChallengeCellNumMap(); + case 1: + return internalGetCDNIIBLIFII(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -637,8 +629,8 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 11: - return internalGetMutableFinishedChallengeCellNumMap(); + case 1: + return internalGetMutableCDNIIBLIFII(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -670,18 +662,18 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - stageId_ = 0; + internalGetMutableCDNIIBLIFII().clear(); + hBINBDBMOED_ = 0; - curLevel_ = 0; + pKOELLIPBHP_ = false; - pOLCMMBAENP_ = 0; + eLHPDAEIMPJ_ = 0; - internalGetMutableFinishedChallengeCellNumMap().clear(); - fNMECPGDCBD_ = false; + curLevel_ = 0; - pDJEIMCPECJ_ = false; + mEMPKCGNNMF_ = 0; - fOCELGIAFLM_ = 0; + cMFPJHFFHBI_ = false; return this; } @@ -710,14 +702,14 @@ public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeD public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo buildPartial() { emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo result = new emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo(this); int from_bitField0_ = bitField0_; - result.stageId_ = stageId_; + result.cDNIIBLIFII_ = internalGetCDNIIBLIFII(); + result.cDNIIBLIFII_.makeImmutable(); + result.hBINBDBMOED_ = hBINBDBMOED_; + result.pKOELLIPBHP_ = pKOELLIPBHP_; + result.eLHPDAEIMPJ_ = eLHPDAEIMPJ_; result.curLevel_ = curLevel_; - result.pOLCMMBAENP_ = pOLCMMBAENP_; - result.finishedChallengeCellNumMap_ = internalGetFinishedChallengeCellNumMap(); - result.finishedChallengeCellNumMap_.makeImmutable(); - result.fNMECPGDCBD_ = fNMECPGDCBD_; - result.pDJEIMCPECJ_ = pDJEIMCPECJ_; - result.fOCELGIAFLM_ = fOCELGIAFLM_; + result.mEMPKCGNNMF_ = mEMPKCGNNMF_; + result.cMFPJHFFHBI_ = cMFPJHFFHBI_; onBuilt(); return result; } @@ -766,25 +758,25 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo other) { if (other == emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance()) return this; - if (other.getStageId() != 0) { - setStageId(other.getStageId()); + internalGetMutableCDNIIBLIFII().mergeFrom( + other.internalGetCDNIIBLIFII()); + if (other.getHBINBDBMOED() != 0) { + setHBINBDBMOED(other.getHBINBDBMOED()); } - if (other.getCurLevel() != 0) { - setCurLevel(other.getCurLevel()); + if (other.getPKOELLIPBHP() != false) { + setPKOELLIPBHP(other.getPKOELLIPBHP()); } - if (other.getPOLCMMBAENP() != 0) { - setPOLCMMBAENP(other.getPOLCMMBAENP()); + if (other.getELHPDAEIMPJ() != 0) { + setELHPDAEIMPJ(other.getELHPDAEIMPJ()); } - internalGetMutableFinishedChallengeCellNumMap().mergeFrom( - other.internalGetFinishedChallengeCellNumMap()); - if (other.getFNMECPGDCBD() != false) { - setFNMECPGDCBD(other.getFNMECPGDCBD()); + if (other.getCurLevel() != 0) { + setCurLevel(other.getCurLevel()); } - if (other.getPDJEIMCPECJ() != false) { - setPDJEIMCPECJ(other.getPDJEIMCPECJ()); + if (other.getMEMPKCGNNMF() != 0) { + setMEMPKCGNNMF(other.getMEMPKCGNNMF()); } - if (other.getFOCELGIAFLM() != 0) { - setFOCELGIAFLM(other.getFOCELGIAFLM()); + if (other.getCMFPJHFFHBI() != false) { + setCMFPJHFFHBI(other.getCMFPJHFFHBI()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -816,193 +808,100 @@ public Builder mergeFrom( } private int bitField0_; - private int stageId_ ; - /** - * uint32 stage_id = 12; - * @return The stageId. - */ - @java.lang.Override - public int getStageId() { - return stageId_; - } - /** - * uint32 stage_id = 12; - * @param value The stageId to set. - * @return This builder for chaining. - */ - public Builder setStageId(int value) { - - stageId_ = value; - onChanged(); - return this; - } - /** - * uint32 stage_id = 12; - * @return This builder for chaining. - */ - public Builder clearStageId() { - - stageId_ = 0; - onChanged(); - return this; - } - - private int curLevel_ ; - /** - * uint32 cur_level = 15; - * @return The curLevel. - */ - @java.lang.Override - public int getCurLevel() { - return curLevel_; - } - /** - * uint32 cur_level = 15; - * @param value The curLevel to set. - * @return This builder for chaining. - */ - public Builder setCurLevel(int value) { - - curLevel_ = value; - onChanged(); - return this; - } - /** - * uint32 cur_level = 15; - * @return This builder for chaining. - */ - public Builder clearCurLevel() { - - curLevel_ = 0; - onChanged(); - return this; - } - - private int pOLCMMBAENP_ ; - /** - * uint32 POLCMMBAENP = 7; - * @return The pOLCMMBAENP. - */ - @java.lang.Override - public int getPOLCMMBAENP() { - return pOLCMMBAENP_; - } - /** - * uint32 POLCMMBAENP = 7; - * @param value The pOLCMMBAENP to set. - * @return This builder for chaining. - */ - public Builder setPOLCMMBAENP(int value) { - - pOLCMMBAENP_ = value; - onChanged(); - return this; - } - /** - * uint32 POLCMMBAENP = 7; - * @return This builder for chaining. - */ - public Builder clearPOLCMMBAENP() { - - pOLCMMBAENP_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.MapField< - java.lang.Integer, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo> finishedChallengeCellNumMap_; + java.lang.Integer, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo> cDNIIBLIFII_; private com.google.protobuf.MapField - internalGetFinishedChallengeCellNumMap() { - if (finishedChallengeCellNumMap_ == null) { + internalGetCDNIIBLIFII() { + if (cDNIIBLIFII_ == null) { return com.google.protobuf.MapField.emptyMapField( - FinishedChallengeCellNumMapDefaultEntryHolder.defaultEntry); + CDNIIBLIFIIDefaultEntryHolder.defaultEntry); } - return finishedChallengeCellNumMap_; + return cDNIIBLIFII_; } private com.google.protobuf.MapField - internalGetMutableFinishedChallengeCellNumMap() { + internalGetMutableCDNIIBLIFII() { onChanged();; - if (finishedChallengeCellNumMap_ == null) { - finishedChallengeCellNumMap_ = com.google.protobuf.MapField.newMapField( - FinishedChallengeCellNumMapDefaultEntryHolder.defaultEntry); + if (cDNIIBLIFII_ == null) { + cDNIIBLIFII_ = com.google.protobuf.MapField.newMapField( + CDNIIBLIFIIDefaultEntryHolder.defaultEntry); } - if (!finishedChallengeCellNumMap_.isMutable()) { - finishedChallengeCellNumMap_ = finishedChallengeCellNumMap_.copy(); + if (!cDNIIBLIFII_.isMutable()) { + cDNIIBLIFII_ = cDNIIBLIFII_.copy(); } - return finishedChallengeCellNumMap_; + return cDNIIBLIFII_; } - public int getFinishedChallengeCellNumMapCount() { - return internalGetFinishedChallengeCellNumMap().getMap().size(); + public int getCDNIIBLIFIICount() { + return internalGetCDNIIBLIFII().getMap().size(); } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ @java.lang.Override - public boolean containsFinishedChallengeCellNumMap( + public boolean containsCDNIIBLIFII( int key) { - return internalGetFinishedChallengeCellNumMap().getMap().containsKey(key); + return internalGetCDNIIBLIFII().getMap().containsKey(key); } /** - * Use {@link #getFinishedChallengeCellNumMapMap()} instead. + * Use {@link #getCDNIIBLIFIIMap()} instead. */ @java.lang.Override @java.lang.Deprecated - public java.util.Map getFinishedChallengeCellNumMap() { - return getFinishedChallengeCellNumMapMap(); + public java.util.Map getCDNIIBLIFII() { + return getCDNIIBLIFIIMap(); } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ @java.lang.Override - public java.util.Map getFinishedChallengeCellNumMapMap() { - return internalGetFinishedChallengeCellNumMap().getMap(); + public java.util.Map getCDNIIBLIFIIMap() { + return internalGetCDNIIBLIFII().getMap(); } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ @java.lang.Override - public emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getFinishedChallengeCellNumMapOrDefault( + public emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getCDNIIBLIFIIOrDefault( int key, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo defaultValue) { java.util.Map map = - internalGetFinishedChallengeCellNumMap().getMap(); + internalGetCDNIIBLIFII().getMap(); return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ @java.lang.Override - public emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getFinishedChallengeCellNumMapOrThrow( + public emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo getCDNIIBLIFIIOrThrow( int key) { java.util.Map map = - internalGetFinishedChallengeCellNumMap().getMap(); + internalGetCDNIIBLIFII().getMap(); if (!map.containsKey(key)) { throw new java.lang.IllegalArgumentException(); } return map.get(key); } - public Builder clearFinishedChallengeCellNumMap() { - internalGetMutableFinishedChallengeCellNumMap().getMutableMap() + public Builder clearCDNIIBLIFII() { + internalGetMutableCDNIIBLIFII().getMutableMap() .clear(); return this; } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ - public Builder removeFinishedChallengeCellNumMap( + public Builder removeCDNIIBLIFII( int key) { - internalGetMutableFinishedChallengeCellNumMap().getMutableMap() + internalGetMutableCDNIIBLIFII().getMutableMap() .remove(key); return this; } @@ -1011,121 +910,214 @@ public Builder removeFinishedChallengeCellNumMap( */ @java.lang.Deprecated public java.util.Map - getMutableFinishedChallengeCellNumMap() { - return internalGetMutableFinishedChallengeCellNumMap().getMutableMap(); + getMutableCDNIIBLIFII() { + return internalGetMutableCDNIIBLIFII().getMutableMap(); } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ - public Builder putFinishedChallengeCellNumMap( + public Builder putCDNIIBLIFII( int key, emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.RoguelikeSettleCoinInfo value) { if (value == null) { throw new java.lang.NullPointerException(); } - internalGetMutableFinishedChallengeCellNumMap().getMutableMap() + internalGetMutableCDNIIBLIFII().getMutableMap() .put(key, value); return this; } /** - * map<uint32, .RoguelikeSettleCoinInfo> finished_challenge_cell_num_map = 11; + * map<uint32, .RoguelikeSettleCoinInfo> CDNIIBLIFII = 1; */ - public Builder putAllFinishedChallengeCellNumMap( + public Builder putAllCDNIIBLIFII( java.util.Map values) { - internalGetMutableFinishedChallengeCellNumMap().getMutableMap() + internalGetMutableCDNIIBLIFII().getMutableMap() .putAll(values); return this; } - private boolean fNMECPGDCBD_ ; + private int hBINBDBMOED_ ; /** - * bool FNMECPGDCBD = 4; - * @return The fNMECPGDCBD. + * uint32 HBINBDBMOED = 2; + * @return The hBINBDBMOED. */ @java.lang.Override - public boolean getFNMECPGDCBD() { - return fNMECPGDCBD_; + public int getHBINBDBMOED() { + return hBINBDBMOED_; } /** - * bool FNMECPGDCBD = 4; - * @param value The fNMECPGDCBD to set. + * uint32 HBINBDBMOED = 2; + * @param value The hBINBDBMOED to set. * @return This builder for chaining. */ - public Builder setFNMECPGDCBD(boolean value) { + public Builder setHBINBDBMOED(int value) { - fNMECPGDCBD_ = value; + hBINBDBMOED_ = value; onChanged(); return this; } /** - * bool FNMECPGDCBD = 4; + * uint32 HBINBDBMOED = 2; * @return This builder for chaining. */ - public Builder clearFNMECPGDCBD() { + public Builder clearHBINBDBMOED() { - fNMECPGDCBD_ = false; + hBINBDBMOED_ = 0; + onChanged(); + return this; + } + + private boolean pKOELLIPBHP_ ; + /** + * bool PKOELLIPBHP = 3; + * @return The pKOELLIPBHP. + */ + @java.lang.Override + public boolean getPKOELLIPBHP() { + return pKOELLIPBHP_; + } + /** + * bool PKOELLIPBHP = 3; + * @param value The pKOELLIPBHP to set. + * @return This builder for chaining. + */ + public Builder setPKOELLIPBHP(boolean value) { + + pKOELLIPBHP_ = value; + onChanged(); + return this; + } + /** + * bool PKOELLIPBHP = 3; + * @return This builder for chaining. + */ + public Builder clearPKOELLIPBHP() { + + pKOELLIPBHP_ = false; + onChanged(); + return this; + } + + private int eLHPDAEIMPJ_ ; + /** + * uint32 ELHPDAEIMPJ = 4; + * @return The eLHPDAEIMPJ. + */ + @java.lang.Override + public int getELHPDAEIMPJ() { + return eLHPDAEIMPJ_; + } + /** + * uint32 ELHPDAEIMPJ = 4; + * @param value The eLHPDAEIMPJ to set. + * @return This builder for chaining. + */ + public Builder setELHPDAEIMPJ(int value) { + + eLHPDAEIMPJ_ = value; + onChanged(); + return this; + } + /** + * uint32 ELHPDAEIMPJ = 4; + * @return This builder for chaining. + */ + public Builder clearELHPDAEIMPJ() { + + eLHPDAEIMPJ_ = 0; + onChanged(); + return this; + } + + private int curLevel_ ; + /** + * uint32 cur_level = 6; + * @return The curLevel. + */ + @java.lang.Override + public int getCurLevel() { + return curLevel_; + } + /** + * uint32 cur_level = 6; + * @param value The curLevel to set. + * @return This builder for chaining. + */ + public Builder setCurLevel(int value) { + + curLevel_ = value; + onChanged(); + return this; + } + /** + * uint32 cur_level = 6; + * @return This builder for chaining. + */ + public Builder clearCurLevel() { + + curLevel_ = 0; onChanged(); return this; } - private boolean pDJEIMCPECJ_ ; + private int mEMPKCGNNMF_ ; /** - * bool PDJEIMCPECJ = 10; - * @return The pDJEIMCPECJ. + * uint32 MEMPKCGNNMF = 10; + * @return The mEMPKCGNNMF. */ @java.lang.Override - public boolean getPDJEIMCPECJ() { - return pDJEIMCPECJ_; + public int getMEMPKCGNNMF() { + return mEMPKCGNNMF_; } /** - * bool PDJEIMCPECJ = 10; - * @param value The pDJEIMCPECJ to set. + * uint32 MEMPKCGNNMF = 10; + * @param value The mEMPKCGNNMF to set. * @return This builder for chaining. */ - public Builder setPDJEIMCPECJ(boolean value) { + public Builder setMEMPKCGNNMF(int value) { - pDJEIMCPECJ_ = value; + mEMPKCGNNMF_ = value; onChanged(); return this; } /** - * bool PDJEIMCPECJ = 10; + * uint32 MEMPKCGNNMF = 10; * @return This builder for chaining. */ - public Builder clearPDJEIMCPECJ() { + public Builder clearMEMPKCGNNMF() { - pDJEIMCPECJ_ = false; + mEMPKCGNNMF_ = 0; onChanged(); return this; } - private int fOCELGIAFLM_ ; + private boolean cMFPJHFFHBI_ ; /** - * uint32 FOCELGIAFLM = 9; - * @return The fOCELGIAFLM. + * bool CMFPJHFFHBI = 14; + * @return The cMFPJHFFHBI. */ @java.lang.Override - public int getFOCELGIAFLM() { - return fOCELGIAFLM_; + public boolean getCMFPJHFFHBI() { + return cMFPJHFFHBI_; } /** - * uint32 FOCELGIAFLM = 9; - * @param value The fOCELGIAFLM to set. + * bool CMFPJHFFHBI = 14; + * @param value The cMFPJHFFHBI to set. * @return This builder for chaining. */ - public Builder setFOCELGIAFLM(int value) { + public Builder setCMFPJHFFHBI(boolean value) { - fOCELGIAFLM_ = value; + cMFPJHFFHBI_ = value; onChanged(); return this; } /** - * uint32 FOCELGIAFLM = 9; + * bool CMFPJHFFHBI = 14; * @return This builder for chaining. */ - public Builder clearFOCELGIAFLM() { + public Builder clearCMFPJHFFHBI() { - fOCELGIAFLM_ = 0; + cMFPJHFFHBI_ = false; onChanged(); return this; } @@ -1188,10 +1180,10 @@ public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeD com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_RoguelikeDungeonSettleInfo_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_RoguelikeDungeonSettleInfo_FinishedChallengeCellNumMapEntry_descriptor; + internal_static_RoguelikeDungeonSettleInfo_CDNIIBLIFIIEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_RoguelikeDungeonSettleInfo_FinishedChallengeCellNumMapEntry_fieldAccessorTable; + internal_static_RoguelikeDungeonSettleInfo_CDNIIBLIFIIEntry_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1202,17 +1194,16 @@ public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeD static { java.lang.String[] descriptorData = { "\n RoguelikeDungeonSettleInfo.proto\032\035Rogu" + - "elikeSettleCoinInfo.proto\"\332\002\n\032RoguelikeD" + - "ungeonSettleInfo\022\020\n\010stage_id\030\014 \001(\r\022\021\n\tcu" + - "r_level\030\017 \001(\r\022\023\n\013POLCMMBAENP\030\007 \001(\r\022e\n\037fi" + - "nished_challenge_cell_num_map\030\013 \003(\0132<.Ro" + - "guelikeDungeonSettleInfo.FinishedChallen" + - "geCellNumMapEntry\022\023\n\013FNMECPGDCBD\030\004 \001(\010\022\023" + - "\n\013PDJEIMCPECJ\030\n \001(\010\022\023\n\013FOCELGIAFLM\030\t \001(\r" + - "\032\\\n FinishedChallengeCellNumMapEntry\022\013\n\003" + - "key\030\001 \001(\r\022\'\n\005value\030\002 \001(\0132\030.RoguelikeSett" + - "leCoinInfo:\0028\001B\033\n\031emu.grasscutter.net.pr" + - "otob\006proto3" + "elikeSettleCoinInfo.proto\"\251\002\n\032RoguelikeD" + + "ungeonSettleInfo\022A\n\013CDNIIBLIFII\030\001 \003(\0132,." + + "RoguelikeDungeonSettleInfo.CDNIIBLIFIIEn" + + "try\022\023\n\013HBINBDBMOED\030\002 \001(\r\022\023\n\013PKOELLIPBHP\030" + + "\003 \001(\010\022\023\n\013ELHPDAEIMPJ\030\004 \001(\r\022\021\n\tcur_level\030" + + "\006 \001(\r\022\023\n\013MEMPKCGNNMF\030\n \001(\r\022\023\n\013CMFPJHFFHB" + + "I\030\016 \001(\010\032L\n\020CDNIIBLIFIIEntry\022\013\n\003key\030\001 \001(\r" + + "\022\'\n\005value\030\002 \001(\0132\030.RoguelikeSettleCoinInf" + + "o:\0028\001B\033\n\031emu.grasscutter.net.protob\006prot" + + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -1224,12 +1215,12 @@ public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeD internal_static_RoguelikeDungeonSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_RoguelikeDungeonSettleInfo_descriptor, - new java.lang.String[] { "StageId", "CurLevel", "POLCMMBAENP", "FinishedChallengeCellNumMap", "FNMECPGDCBD", "PDJEIMCPECJ", "FOCELGIAFLM", }); - internal_static_RoguelikeDungeonSettleInfo_FinishedChallengeCellNumMapEntry_descriptor = + new java.lang.String[] { "CDNIIBLIFII", "HBINBDBMOED", "PKOELLIPBHP", "ELHPDAEIMPJ", "CurLevel", "MEMPKCGNNMF", "CMFPJHFFHBI", }); + internal_static_RoguelikeDungeonSettleInfo_CDNIIBLIFIIEntry_descriptor = internal_static_RoguelikeDungeonSettleInfo_descriptor.getNestedTypes().get(0); - internal_static_RoguelikeDungeonSettleInfo_FinishedChallengeCellNumMapEntry_fieldAccessorTable = new + internal_static_RoguelikeDungeonSettleInfo_CDNIIBLIFIIEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_RoguelikeDungeonSettleInfo_FinishedChallengeCellNumMapEntry_descriptor, + internal_static_RoguelikeDungeonSettleInfo_CDNIIBLIFIIEntry_descriptor, new java.lang.String[] { "Key", "Value", }); emu.grasscutter.net.proto.RoguelikeSettleCoinInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityMoveNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityMoveNotifyOuterClass.java index 5cc3a8802e0..edd93100249 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityMoveNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityMoveNotifyOuterClass.java @@ -34,13 +34,7 @@ public interface SceneEntityMoveNotifyOrBuilder extends emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfoOrBuilder getMotionInfoOrBuilder(); /** - * uint32 entity_id = 11; - * @return The entityId. - */ - int getEntityId(); - - /** - * uint32 reliable_seq = 10; + * uint32 reliable_seq = 5; * @return The reliableSeq. */ int getReliableSeq(); @@ -50,11 +44,16 @@ public interface SceneEntityMoveNotifyOrBuilder extends * @return The sceneTime. */ int getSceneTime(); + + /** + * uint32 entity_id = 15; + * @return The entityId. + */ + int getEntityId(); } /** * 
-   * CmdId: 25367
-   * Obf: CNFNMBHLHEK
+   * CmdId: 7026
    *
* * Protobuf type {@code SceneEntityMoveNotify} @@ -101,6 +100,11 @@ private SceneEntityMoveNotify( case 0: done = true; break; + case 40: { + + reliableSeq_ = input.readUInt32(); + break; + } case 58: { emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo.Builder subBuilder = null; if (motionInfo_ != null) { @@ -114,21 +118,16 @@ private SceneEntityMoveNotify( break; } - case 80: { + case 112: { - reliableSeq_ = input.readUInt32(); + sceneTime_ = input.readUInt32(); break; } - case 88: { + case 120: { entityId_ = input.readUInt32(); break; } - case 112: { - - sceneTime_ = input.readUInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -187,21 +186,10 @@ public emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfoOrBuilder getMot return getMotionInfo(); } - public static final int ENTITY_ID_FIELD_NUMBER = 11; - private int entityId_; - /** - * uint32 entity_id = 11; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - - public static final int RELIABLE_SEQ_FIELD_NUMBER = 10; + public static final int RELIABLE_SEQ_FIELD_NUMBER = 5; private int reliableSeq_; /** - * uint32 reliable_seq = 10; + * uint32 reliable_seq = 5; * @return The reliableSeq. */ @java.lang.Override @@ -220,6 +208,17 @@ public int getSceneTime() { return sceneTime_; } + public static final int ENTITY_ID_FIELD_NUMBER = 15; + private int entityId_; + /** + * uint32 entity_id = 15; + * @return The entityId. + */ + @java.lang.Override + public int getEntityId() { + return entityId_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -234,18 +233,18 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (motionInfo_ != null) { - output.writeMessage(7, getMotionInfo()); - } if (reliableSeq_ != 0) { - output.writeUInt32(10, reliableSeq_); + output.writeUInt32(5, reliableSeq_); } - if (entityId_ != 0) { - output.writeUInt32(11, entityId_); + if (motionInfo_ != null) { + output.writeMessage(7, getMotionInfo()); } if (sceneTime_ != 0) { output.writeUInt32(14, sceneTime_); } + if (entityId_ != 0) { + output.writeUInt32(15, entityId_); + } unknownFields.writeTo(output); } @@ -255,22 +254,22 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (motionInfo_ != null) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, getMotionInfo()); - } if (reliableSeq_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, reliableSeq_); + .computeUInt32Size(5, reliableSeq_); } - if (entityId_ != 0) { + if (motionInfo_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, entityId_); + .computeMessageSize(7, getMotionInfo()); } if (sceneTime_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(14, sceneTime_); } + if (entityId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(15, entityId_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -291,12 +290,12 @@ public boolean equals(final java.lang.Object obj) { if (!getMotionInfo() .equals(other.getMotionInfo())) return false; } - if (getEntityId() - != other.getEntityId()) return false; if (getReliableSeq() != other.getReliableSeq()) return false; if (getSceneTime() != other.getSceneTime()) return false; + if (getEntityId() + != other.getEntityId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -312,12 +311,12 @@ public int hashCode() { hash = (37 * hash) + MOTION_INFO_FIELD_NUMBER; hash = (53 * hash) + getMotionInfo().hashCode(); } - hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; - hash = (53 * hash) + getEntityId(); hash = (37 * hash) + RELIABLE_SEQ_FIELD_NUMBER; hash = (53 * hash) + getReliableSeq(); hash = (37 * hash) + SCENE_TIME_FIELD_NUMBER; hash = (53 * hash) + getSceneTime(); + hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER; + hash = (53 * hash) + getEntityId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -415,8 +414,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25367
-     * Obf: CNFNMBHLHEK
+     * CmdId: 7026
      *
* * Protobuf type {@code SceneEntityMoveNotify} @@ -462,12 +460,12 @@ public Builder clear() { motionInfo_ = null; motionInfoBuilder_ = null; } - entityId_ = 0; - reliableSeq_ = 0; sceneTime_ = 0; + entityId_ = 0; + return this; } @@ -499,9 +497,9 @@ public emu.grasscutter.net.proto.SceneEntityMoveNotifyOuterClass.SceneEntityMove } else { result.motionInfo_ = motionInfoBuilder_.build(); } - result.entityId_ = entityId_; result.reliableSeq_ = reliableSeq_; result.sceneTime_ = sceneTime_; + result.entityId_ = entityId_; onBuilt(); return result; } @@ -553,15 +551,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.SceneEntityMoveNotifyOuterCla if (other.hasMotionInfo()) { mergeMotionInfo(other.getMotionInfo()); } - if (other.getEntityId() != 0) { - setEntityId(other.getEntityId()); - } if (other.getReliableSeq() != 0) { setReliableSeq(other.getReliableSeq()); } if (other.getSceneTime() != 0) { setSceneTime(other.getSceneTime()); } + if (other.getEntityId() != 0) { + setEntityId(other.getEntityId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -710,40 +708,9 @@ public emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfoOrBuilder getMot return motionInfoBuilder_; } - private int entityId_ ; - /** - * uint32 entity_id = 11; - * @return The entityId. - */ - @java.lang.Override - public int getEntityId() { - return entityId_; - } - /** - * uint32 entity_id = 11; - * @param value The entityId to set. - * @return This builder for chaining. - */ - public Builder setEntityId(int value) { - - entityId_ = value; - onChanged(); - return this; - } - /** - * uint32 entity_id = 11; - * @return This builder for chaining. - */ - public Builder clearEntityId() { - - entityId_ = 0; - onChanged(); - return this; - } - private int reliableSeq_ ; /** - * uint32 reliable_seq = 10; + * uint32 reliable_seq = 5; * @return The reliableSeq. */ @java.lang.Override @@ -751,7 +718,7 @@ public int getReliableSeq() { return reliableSeq_; } /** - * uint32 reliable_seq = 10; + * uint32 reliable_seq = 5; * @param value The reliableSeq to set. * @return This builder for chaining. */ @@ -762,7 +729,7 @@ public Builder setReliableSeq(int value) { return this; } /** - * uint32 reliable_seq = 10; + * uint32 reliable_seq = 5; * @return This builder for chaining. */ public Builder clearReliableSeq() { @@ -802,6 +769,37 @@ public Builder clearSceneTime() { onChanged(); return this; } + + private int entityId_ ; + /** + * uint32 entity_id = 15; + * @return The entityId. + */ + @java.lang.Override + public int getEntityId() { + return entityId_; + } + /** + * uint32 entity_id = 15; + * @param value The entityId to set. + * @return This builder for chaining. + */ + public Builder setEntityId(int value) { + + entityId_ = value; + onChanged(); + return this; + } + /** + * uint32 entity_id = 15; + * @return This builder for chaining. + */ + public Builder clearEntityId() { + + entityId_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -871,9 +869,9 @@ public emu.grasscutter.net.proto.SceneEntityMoveNotifyOuterClass.SceneEntityMove java.lang.String[] descriptorData = { "\n\033SceneEntityMoveNotify.proto\032\020MotionInf" + "o.proto\"v\n\025SceneEntityMoveNotify\022 \n\013moti" + - "on_info\030\007 \001(\0132\013.MotionInfo\022\021\n\tentity_id\030" + - "\013 \001(\r\022\024\n\014reliable_seq\030\n \001(\r\022\022\n\nscene_tim" + - "e\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" + + "on_info\030\007 \001(\0132\013.MotionInfo\022\024\n\014reliable_s" + + "eq\030\005 \001(\r\022\022\n\nscene_time\030\016 \001(\r\022\021\n\tentity_i" + + "d\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" + "oto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -886,7 +884,7 @@ public emu.grasscutter.net.proto.SceneEntityMoveNotifyOuterClass.SceneEntityMove internal_static_SceneEntityMoveNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SceneEntityMoveNotify_descriptor, - new java.lang.String[] { "MotionInfo", "EntityId", "ReliableSeq", "SceneTime", }); + new java.lang.String[] { "MotionInfo", "ReliableSeq", "SceneTime", "EntityId", }); emu.grasscutter.net.proto.MotionInfoOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityUpdateNotifyOuterClass.java index f542871074b..5dadea3cce5 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityUpdateNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityUpdateNotifyOuterClass.java @@ -1006,8 +1006,8 @@ public emu.grasscutter.net.proto.SceneEntityUpdateNotifyOuterClass.SceneEntityUp descriptor; static { java.lang.String[] descriptorData = { - "\n\035SceneEntityUpdateNotify.proto\032\020VisionT" + - "ype.proto\032\025SceneEntityInfo.proto\"q\n\027Scen" + + "\n\035SceneEntityUpdateNotify.proto\032\025SceneEn" + + "tityInfo.proto\032\020VisionType.proto\"q\n\027Scen" + "eEntityUpdateNotify\022\r\n\005param\030\002 \001(\r\022%\n\013en" + "tity_list\030\007 \003(\0132\020.SceneEntityInfo\022 \n\013app" + "ear_type\030\017 \001(\0162\013.VisionTypeB\033\n\031emu.grass" + @@ -1016,8 +1016,8 @@ public emu.grasscutter.net.proto.SceneEntityUpdateNotifyOuterClass.SceneEntityUp descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor(), emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor(), + emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor(), }); internal_static_SceneEntityUpdateNotify_descriptor = getDescriptor().getMessageTypes().get(0); @@ -1025,8 +1025,8 @@ public emu.grasscutter.net.proto.SceneEntityUpdateNotifyOuterClass.SceneEntityUp com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SceneEntityUpdateNotify_descriptor, new java.lang.String[] { "Param", "EntityList", "AppearType", }); - emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor(); emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor(); + emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneKickPlayerReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneKickPlayerReqOuterClass.java index 3228e67a466..d115fa2a732 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SceneKickPlayerReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneKickPlayerReqOuterClass.java @@ -19,15 +19,16 @@ public interface SceneKickPlayerReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 target_uid = 4; + * uint32 target_uid = 5; * @return The targetUid. */ int getTargetUid(); } /** * 
-   * CmdId: 29095
-   * Obf: HMIBDCFKKBC
+   * CmdId: 27213
+   * obf: CBLGKKOMLBP
+   * 5.0
    *
* * Protobuf type {@code SceneKickPlayerReq} @@ -74,7 +75,7 @@ private SceneKickPlayerReq( case 0: done = true; break; - case 32: { + case 40: { targetUid_ = input.readUInt32(); break; @@ -111,10 +112,10 @@ private SceneKickPlayerReq( emu.grasscutter.net.proto.SceneKickPlayerReqOuterClass.SceneKickPlayerReq.class, emu.grasscutter.net.proto.SceneKickPlayerReqOuterClass.SceneKickPlayerReq.Builder.class); } - public static final int TARGET_UID_FIELD_NUMBER = 4; + public static final int TARGET_UID_FIELD_NUMBER = 5; private int targetUid_; /** - * uint32 target_uid = 4; + * uint32 target_uid = 5; * @return The targetUid. */ @java.lang.Override @@ -137,7 +138,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (targetUid_ != 0) { - output.writeUInt32(4, targetUid_); + output.writeUInt32(5, targetUid_); } unknownFields.writeTo(output); } @@ -150,7 +151,7 @@ public int getSerializedSize() { size = 0; if (targetUid_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, targetUid_); + .computeUInt32Size(5, targetUid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +280,9 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 29095
-     * Obf: HMIBDCFKKBC
+     * CmdId: 27213
+     * obf: CBLGKKOMLBP
+     * 5.0
      *
* * Protobuf type {@code SceneKickPlayerReq} @@ -431,7 +433,7 @@ public Builder mergeFrom( private int targetUid_ ; /** - * uint32 target_uid = 4; + * uint32 target_uid = 5; * @return The targetUid. */ @java.lang.Override @@ -439,7 +441,7 @@ public int getTargetUid() { return targetUid_; } /** - * uint32 target_uid = 4; + * uint32 target_uid = 5; * @param value The targetUid to set. * @return This builder for chaining. */ @@ -450,7 +452,7 @@ public Builder setTargetUid(int value) { return this; } /** - * uint32 target_uid = 4; + * uint32 target_uid = 5; * @return This builder for chaining. */ public Builder clearTargetUid() { @@ -527,7 +529,7 @@ public emu.grasscutter.net.proto.SceneKickPlayerReqOuterClass.SceneKickPlayerReq static { java.lang.String[] descriptorData = { "\n\030SceneKickPlayerReq.proto\"(\n\022SceneKickP" + - "layerReq\022\022\n\ntarget_uid\030\004 \001(\rB\033\n\031emu.gras" + + "layerReq\022\022\n\ntarget_uid\030\005 \001(\rB\033\n\031emu.gras" + "scutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneKickPlayerRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneKickPlayerRspOuterClass.java index 4363d47b451..04e559105b3 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SceneKickPlayerRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneKickPlayerRspOuterClass.java @@ -25,15 +25,15 @@ public interface SceneKickPlayerRspOrBuilder extends int getTargetUid(); /** - * int32 retcode = 1; + * int32 retcode = 12; * @return The retcode. */ int getRetcode(); } /** * 
-   * CmdId: 27200
-   * Obf: IBIKNKAPMNJ
+   * 5.0
+   * CmdId: 7966
    *
* * Protobuf type {@code SceneKickPlayerRsp} @@ -80,14 +80,14 @@ private SceneKickPlayerRsp( case 0: done = true; break; - case 8: { + case 32: { - retcode_ = input.readInt32(); + targetUid_ = input.readUInt32(); break; } - case 32: { + case 96: { - targetUid_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } default: { @@ -133,10 +133,10 @@ public int getTargetUid() { return targetUid_; } - public static final int RETCODE_FIELD_NUMBER = 1; + public static final int RETCODE_FIELD_NUMBER = 12; private int retcode_; /** - * int32 retcode = 1; + * int32 retcode = 12; * @return The retcode. */ @java.lang.Override @@ -158,12 +158,12 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (retcode_ != 0) { - output.writeInt32(1, retcode_); - } if (targetUid_ != 0) { output.writeUInt32(4, targetUid_); } + if (retcode_ != 0) { + output.writeInt32(12, retcode_); + } unknownFields.writeTo(output); } @@ -173,14 +173,14 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, retcode_); - } if (targetUid_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(4, targetUid_); } + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(12, retcode_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -312,8 +312,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27200
-     * Obf: IBIKNKAPMNJ
+     * 5.0
+     * CmdId: 7966
      *
* * Protobuf type {@code SceneKickPlayerRsp} @@ -501,7 +501,7 @@ public Builder clearTargetUid() { private int retcode_ ; /** - * int32 retcode = 1; + * int32 retcode = 12; * @return The retcode. */ @java.lang.Override @@ -509,7 +509,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 1; + * int32 retcode = 12; * @param value The retcode to set. * @return This builder for chaining. */ @@ -520,7 +520,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 1; + * int32 retcode = 12; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -598,7 +598,7 @@ public emu.grasscutter.net.proto.SceneKickPlayerRspOuterClass.SceneKickPlayerRsp java.lang.String[] descriptorData = { "\n\030SceneKickPlayerRsp.proto\"9\n\022SceneKickP" + "layerRsp\022\022\n\ntarget_uid\030\004 \001(\r\022\017\n\007retcode\030" + - "\001 \001(\005B\033\n\031emu.grasscutter.net.protob\006prot" + + "\014 \001(\005B\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerSoundNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerSoundNotifyOuterClass.java index 767797c6f01..2ac3c64d8b7 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerSoundNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerSoundNotifyOuterClass.java @@ -19,32 +19,32 @@ public interface ScenePlayerSoundNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .Vector play_pos = 15; + * string sound_name = 2; + * @return The soundName. + */ + java.lang.String getSoundName(); + /** + * string sound_name = 2; + * @return The bytes for soundName. + */ + com.google.protobuf.ByteString + getSoundNameBytes(); + + /** + * .Vector play_pos = 4; * @return Whether the playPos field is set. */ boolean hasPlayPos(); /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; * @return The playPos. */ emu.grasscutter.net.proto.VectorOuterClass.Vector getPlayPos(); /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; */ emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPlayPosOrBuilder(); - /** - * string sound_name = 1; - * @return The soundName. - */ - java.lang.String getSoundName(); - /** - * string sound_name = 1; - * @return The bytes for soundName. - */ - com.google.protobuf.ByteString - getSoundNameBytes(); - /** * .ScenePlayerSoundNotify.PlaySoundType play_type = 11; * @return The enum numeric value on the wire for playType. @@ -58,8 +58,8 @@ public interface ScenePlayerSoundNotifyOrBuilder extends } /** * 
-   * CmdId: 20293
-   * Obf: JBEGDKFLHPL
+   * CmdId: 1408
+   * obf: KAENNLDMMEL
    *
* * Protobuf type {@code ScenePlayerSoundNotify} @@ -108,19 +108,13 @@ private ScenePlayerSoundNotify( case 0: done = true; break; - case 10: { + case 18: { java.lang.String s = input.readStringRequireUtf8(); soundName_ = s; break; } - case 88: { - int rawValue = input.readEnum(); - - playType_ = rawValue; - break; - } - case 122: { + case 34: { emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null; if (playPos_ != null) { subBuilder = playPos_.toBuilder(); @@ -133,6 +127,12 @@ private ScenePlayerSoundNotify( break; } + case 88: { + int rawValue = input.readEnum(); + + playType_ = rawValue; + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -167,7 +167,7 @@ private ScenePlayerSoundNotify( /** * 
-     * Obf: NDMKCNLGDFN
+     * obf: DLJMGIAMGLF
      *
* * Protobuf enum {@code ScenePlayerSoundNotify.PlaySoundType} @@ -286,36 +286,10 @@ private PlaySoundType(int value) { // @@protoc_insertion_point(enum_scope:ScenePlayerSoundNotify.PlaySoundType) } - public static final int PLAY_POS_FIELD_NUMBER = 15; - private emu.grasscutter.net.proto.VectorOuterClass.Vector playPos_; - /** - * .Vector play_pos = 15; - * @return Whether the playPos field is set. - */ - @java.lang.Override - public boolean hasPlayPos() { - return playPos_ != null; - } - /** - * .Vector play_pos = 15; - * @return The playPos. - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.Vector getPlayPos() { - return playPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : playPos_; - } - /** - * .Vector play_pos = 15; - */ - @java.lang.Override - public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPlayPosOrBuilder() { - return getPlayPos(); - } - - public static final int SOUND_NAME_FIELD_NUMBER = 1; + public static final int SOUND_NAME_FIELD_NUMBER = 2; private volatile java.lang.Object soundName_; /** - * string sound_name = 1; + * string sound_name = 2; * @return The soundName. */ @java.lang.Override @@ -332,7 +306,7 @@ public java.lang.String getSoundName() { } } /** - * string sound_name = 1; + * string sound_name = 2; * @return The bytes for soundName. */ @java.lang.Override @@ -350,6 +324,32 @@ public java.lang.String getSoundName() { } } + public static final int PLAY_POS_FIELD_NUMBER = 4; + private emu.grasscutter.net.proto.VectorOuterClass.Vector playPos_; + /** + * .Vector play_pos = 4; + * @return Whether the playPos field is set. + */ + @java.lang.Override + public boolean hasPlayPos() { + return playPos_ != null; + } + /** + * .Vector play_pos = 4; + * @return The playPos. + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.Vector getPlayPos() { + return playPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : playPos_; + } + /** + * .Vector play_pos = 4; + */ + @java.lang.Override + public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPlayPosOrBuilder() { + return getPlayPos(); + } + public static final int PLAY_TYPE_FIELD_NUMBER = 11; private int playType_; /** @@ -384,14 +384,14 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(soundName_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, soundName_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, soundName_); + } + if (playPos_ != null) { + output.writeMessage(4, getPlayPos()); } if (playType_ != emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify.PlaySoundType.PLAY_SOUND_NONE.getNumber()) { output.writeEnum(11, playType_); } - if (playPos_ != null) { - output.writeMessage(15, getPlayPos()); - } unknownFields.writeTo(output); } @@ -402,15 +402,15 @@ public int getSerializedSize() { size = 0; if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(soundName_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, soundName_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, soundName_); } - if (playType_ != emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify.PlaySoundType.PLAY_SOUND_NONE.getNumber()) { + if (playPos_ != null) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(11, playType_); + .computeMessageSize(4, getPlayPos()); } - if (playPos_ != null) { + if (playType_ != emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify.PlaySoundType.PLAY_SOUND_NONE.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, getPlayPos()); + .computeEnumSize(11, playType_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -427,13 +427,13 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify other = (emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify) obj; + if (!getSoundName() + .equals(other.getSoundName())) return false; if (hasPlayPos() != other.hasPlayPos()) return false; if (hasPlayPos()) { if (!getPlayPos() .equals(other.getPlayPos())) return false; } - if (!getSoundName() - .equals(other.getSoundName())) return false; if (playType_ != other.playType_) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -446,12 +446,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + SOUND_NAME_FIELD_NUMBER; + hash = (53 * hash) + getSoundName().hashCode(); if (hasPlayPos()) { hash = (37 * hash) + PLAY_POS_FIELD_NUMBER; hash = (53 * hash) + getPlayPos().hashCode(); } - hash = (37 * hash) + SOUND_NAME_FIELD_NUMBER; - hash = (53 * hash) + getSoundName().hashCode(); hash = (37 * hash) + PLAY_TYPE_FIELD_NUMBER; hash = (53 * hash) + playType_; hash = (29 * hash) + unknownFields.hashCode(); @@ -551,8 +551,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20293
-     * Obf: JBEGDKFLHPL
+     * CmdId: 1408
+     * obf: KAENNLDMMEL
      *
* * Protobuf type {@code ScenePlayerSoundNotify} @@ -592,14 +592,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + soundName_ = ""; + if (playPosBuilder_ == null) { playPos_ = null; } else { playPos_ = null; playPosBuilder_ = null; } - soundName_ = ""; - playType_ = 0; return this; @@ -628,12 +628,12 @@ public emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSou @java.lang.Override public emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify buildPartial() { emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify result = new emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify(this); + result.soundName_ = soundName_; if (playPosBuilder_ == null) { result.playPos_ = playPos_; } else { result.playPos_ = playPosBuilder_.build(); } - result.soundName_ = soundName_; result.playType_ = playType_; onBuilt(); return result; @@ -683,13 +683,13 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify other) { if (other == emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSoundNotify.getDefaultInstance()) return this; - if (other.hasPlayPos()) { - mergePlayPos(other.getPlayPos()); - } if (!other.getSoundName().isEmpty()) { soundName_ = other.soundName_; onChanged(); } + if (other.hasPlayPos()) { + mergePlayPos(other.getPlayPos()); + } if (other.playType_ != 0) { setPlayTypeValue(other.getPlayTypeValue()); } @@ -722,18 +722,94 @@ public Builder mergeFrom( return this; } + private java.lang.Object soundName_ = ""; + /** + * string sound_name = 2; + * @return The soundName. + */ + public java.lang.String getSoundName() { + java.lang.Object ref = soundName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + soundName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string sound_name = 2; + * @return The bytes for soundName. + */ + public com.google.protobuf.ByteString + getSoundNameBytes() { + java.lang.Object ref = soundName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + soundName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string sound_name = 2; + * @param value The soundName to set. + * @return This builder for chaining. + */ + public Builder setSoundName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + soundName_ = value; + onChanged(); + return this; + } + /** + * string sound_name = 2; + * @return This builder for chaining. + */ + public Builder clearSoundName() { + + soundName_ = getDefaultInstance().getSoundName(); + onChanged(); + return this; + } + /** + * string sound_name = 2; + * @param value The bytes for soundName to set. + * @return This builder for chaining. + */ + public Builder setSoundNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + soundName_ = value; + onChanged(); + return this; + } + private emu.grasscutter.net.proto.VectorOuterClass.Vector playPos_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> playPosBuilder_; /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; * @return Whether the playPos field is set. */ public boolean hasPlayPos() { return playPosBuilder_ != null || playPos_ != null; } /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; * @return The playPos. */ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPlayPos() { @@ -744,7 +820,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPlayPos() { } } /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; */ public Builder setPlayPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (playPosBuilder_ == null) { @@ -760,7 +836,7 @@ public Builder setPlayPos(emu.grasscutter.net.proto.VectorOuterClass.Vector valu return this; } /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; */ public Builder setPlayPos( emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) { @@ -774,7 +850,7 @@ public Builder setPlayPos( return this; } /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; */ public Builder mergePlayPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) { if (playPosBuilder_ == null) { @@ -792,7 +868,7 @@ public Builder mergePlayPos(emu.grasscutter.net.proto.VectorOuterClass.Vector va return this; } /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; */ public Builder clearPlayPos() { if (playPosBuilder_ == null) { @@ -806,7 +882,7 @@ public Builder clearPlayPos() { return this; } /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPlayPosBuilder() { @@ -814,7 +890,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPlayPosBuild return getPlayPosFieldBuilder().getBuilder(); } /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; */ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPlayPosOrBuilder() { if (playPosBuilder_ != null) { @@ -825,7 +901,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPlayPosOrBu } } /** - * .Vector play_pos = 15; + * .Vector play_pos = 4; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> @@ -841,82 +917,6 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPlayPosOrBu return playPosBuilder_; } - private java.lang.Object soundName_ = ""; - /** - * string sound_name = 1; - * @return The soundName. - */ - public java.lang.String getSoundName() { - java.lang.Object ref = soundName_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - soundName_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * string sound_name = 1; - * @return The bytes for soundName. - */ - public com.google.protobuf.ByteString - getSoundNameBytes() { - java.lang.Object ref = soundName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - soundName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * string sound_name = 1; - * @param value The soundName to set. - * @return This builder for chaining. - */ - public Builder setSoundName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - soundName_ = value; - onChanged(); - return this; - } - /** - * string sound_name = 1; - * @return This builder for chaining. - */ - public Builder clearSoundName() { - - soundName_ = getDefaultInstance().getSoundName(); - onChanged(); - return this; - } - /** - * string sound_name = 1; - * @param value The bytes for soundName to set. - * @return This builder for chaining. - */ - public Builder setSoundNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - soundName_ = value; - onChanged(); - return this; - } - private int playType_ = 0; /** * .ScenePlayerSoundNotify.PlaySoundType play_type = 11; @@ -1038,8 +1038,8 @@ public emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSou static { java.lang.String[] descriptorData = { "\n\034ScenePlayerSoundNotify.proto\032\014Vector.p" + - "roto\"\322\001\n\026ScenePlayerSoundNotify\022\031\n\010play_" + - "pos\030\017 \001(\0132\007.Vector\022\022\n\nsound_name\030\001 \001(\t\0228" + + "roto\"\322\001\n\026ScenePlayerSoundNotify\022\022\n\nsound" + + "_name\030\002 \001(\t\022\031\n\010play_pos\030\004 \001(\0132\007.Vector\0228" + "\n\tplay_type\030\013 \001(\0162%.ScenePlayerSoundNoti" + "fy.PlaySoundType\"O\n\rPlaySoundType\022\023\n\017PLA" + "Y_SOUND_NONE\020\000\022\024\n\020PLAY_SOUND_START\020\001\022\023\n\017" + @@ -1056,7 +1056,7 @@ public emu.grasscutter.net.proto.ScenePlayerSoundNotifyOuterClass.ScenePlayerSou internal_static_ScenePlayerSoundNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ScenePlayerSoundNotify_descriptor, - new java.lang.String[] { "PlayPos", "SoundName", "PlayType", }); + new java.lang.String[] { "SoundName", "PlayPos", "PlayType", }); emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java index 5cdbec97468..6833d84aa7c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java @@ -42,38 +42,38 @@ public interface ScenePointUnlockNotifyOrBuilder extends int getUnhidePointList(int index); /** - * repeated uint32 point_list = 11; - * @return A list containing the pointList. + * repeated uint32 hide_point_list = 11; + * @return A list containing the hidePointList. */ - java.util.List getPointListList(); + java.util.List getHidePointListList(); /** - * repeated uint32 point_list = 11; - * @return The count of pointList. + * repeated uint32 hide_point_list = 11; + * @return The count of hidePointList. */ - int getPointListCount(); + int getHidePointListCount(); /** - * repeated uint32 point_list = 11; + * repeated uint32 hide_point_list = 11; * @param index The index of the element to return. - * @return The pointList at the given index. + * @return The hidePointList at the given index. */ - int getPointList(int index); + int getHidePointList(int index); /** - * repeated uint32 hide_point_list = 13; - * @return A list containing the hidePointList. + * repeated uint32 point_list = 13; + * @return A list containing the pointList. */ - java.util.List getHidePointListList(); + java.util.List getPointListList(); /** - * repeated uint32 hide_point_list = 13; - * @return The count of hidePointList. + * repeated uint32 point_list = 13; + * @return The count of pointList. */ - int getHidePointListCount(); + int getPointListCount(); /** - * repeated uint32 hide_point_list = 13; + * repeated uint32 point_list = 13; * @param index The index of the element to return. - * @return The hidePointList at the given index. + * @return The pointList at the given index. */ - int getHidePointList(int index); + int getPointList(int index); /** * repeated uint32 locked_point_list = 15; @@ -93,6 +93,10 @@ public interface ScenePointUnlockNotifyOrBuilder extends int getLockedPointList(int index); } /** + * 
+   * CmdId: 21959
+   *
+ * * Protobuf type {@code ScenePointUnlockNotify} */ public static final class ScenePointUnlockNotify extends @@ -106,8 +110,8 @@ private ScenePointUnlockNotify(com.google.protobuf.GeneratedMessageV3.Builder } private ScenePointUnlockNotify() { unhidePointList_ = emptyIntList(); - pointList_ = emptyIntList(); hidePointList_ = emptyIntList(); + pointList_ = emptyIntList(); lockedPointList_ = emptyIntList(); } @@ -170,42 +174,42 @@ private ScenePointUnlockNotify( } case 88: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - pointList_ = newIntList(); + hidePointList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - pointList_.addInt(input.readUInt32()); + hidePointList_.addInt(input.readUInt32()); break; } case 90: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - pointList_ = newIntList(); + hidePointList_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - pointList_.addInt(input.readUInt32()); + hidePointList_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 104: { if (!((mutable_bitField0_ & 0x00000004) != 0)) { - hidePointList_ = newIntList(); + pointList_ = newIntList(); mutable_bitField0_ |= 0x00000004; } - hidePointList_.addInt(input.readUInt32()); + pointList_.addInt(input.readUInt32()); break; } case 106: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { - hidePointList_ = newIntList(); + pointList_ = newIntList(); mutable_bitField0_ |= 0x00000004; } while (input.getBytesUntilLimit() > 0) { - hidePointList_.addInt(input.readUInt32()); + pointList_.addInt(input.readUInt32()); } input.popLimit(limit); break; @@ -250,10 +254,10 @@ private ScenePointUnlockNotify( unhidePointList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { - pointList_.makeImmutable(); // C + hidePointList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000004) != 0)) { - hidePointList_.makeImmutable(); // C + pointList_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000008) != 0)) { lockedPointList_.makeImmutable(); // C @@ -314,61 +318,61 @@ public int getUnhidePointList(int index) { } private int unhidePointListMemoizedSerializedSize = -1; - public static final int POINT_LIST_FIELD_NUMBER = 11; - private com.google.protobuf.Internal.IntList pointList_; + public static final int HIDE_POINT_LIST_FIELD_NUMBER = 11; + private com.google.protobuf.Internal.IntList hidePointList_; /** - * repeated uint32 point_list = 11; - * @return A list containing the pointList. + * repeated uint32 hide_point_list = 11; + * @return A list containing the hidePointList. */ @java.lang.Override public java.util.List - getPointListList() { - return pointList_; + getHidePointListList() { + return hidePointList_; } /** - * repeated uint32 point_list = 11; - * @return The count of pointList. + * repeated uint32 hide_point_list = 11; + * @return The count of hidePointList. */ - public int getPointListCount() { - return pointList_.size(); + public int getHidePointListCount() { + return hidePointList_.size(); } /** - * repeated uint32 point_list = 11; + * repeated uint32 hide_point_list = 11; * @param index The index of the element to return. - * @return The pointList at the given index. + * @return The hidePointList at the given index. */ - public int getPointList(int index) { - return pointList_.getInt(index); + public int getHidePointList(int index) { + return hidePointList_.getInt(index); } - private int pointListMemoizedSerializedSize = -1; + private int hidePointListMemoizedSerializedSize = -1; - public static final int HIDE_POINT_LIST_FIELD_NUMBER = 13; - private com.google.protobuf.Internal.IntList hidePointList_; + public static final int POINT_LIST_FIELD_NUMBER = 13; + private com.google.protobuf.Internal.IntList pointList_; /** - * repeated uint32 hide_point_list = 13; - * @return A list containing the hidePointList. + * repeated uint32 point_list = 13; + * @return A list containing the pointList. */ @java.lang.Override public java.util.List - getHidePointListList() { - return hidePointList_; + getPointListList() { + return pointList_; } /** - * repeated uint32 hide_point_list = 13; - * @return The count of hidePointList. + * repeated uint32 point_list = 13; + * @return The count of pointList. */ - public int getHidePointListCount() { - return hidePointList_.size(); + public int getPointListCount() { + return pointList_.size(); } /** - * repeated uint32 hide_point_list = 13; + * repeated uint32 point_list = 13; * @param index The index of the element to return. - * @return The hidePointList at the given index. + * @return The pointList at the given index. */ - public int getHidePointList(int index) { - return hidePointList_.getInt(index); + public int getPointList(int index) { + return pointList_.getInt(index); } - private int hidePointListMemoizedSerializedSize = -1; + private int pointListMemoizedSerializedSize = -1; public static final int LOCKED_POINT_LIST_FIELD_NUMBER = 15; private com.google.protobuf.Internal.IntList lockedPointList_; @@ -423,20 +427,20 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < unhidePointList_.size(); i++) { output.writeUInt32NoTag(unhidePointList_.getInt(i)); } - if (getPointListList().size() > 0) { - output.writeUInt32NoTag(90); - output.writeUInt32NoTag(pointListMemoizedSerializedSize); - } - for (int i = 0; i < pointList_.size(); i++) { - output.writeUInt32NoTag(pointList_.getInt(i)); - } if (getHidePointListList().size() > 0) { - output.writeUInt32NoTag(106); + output.writeUInt32NoTag(90); output.writeUInt32NoTag(hidePointListMemoizedSerializedSize); } for (int i = 0; i < hidePointList_.size(); i++) { output.writeUInt32NoTag(hidePointList_.getInt(i)); } + if (getPointListList().size() > 0) { + output.writeUInt32NoTag(106); + output.writeUInt32NoTag(pointListMemoizedSerializedSize); + } + for (int i = 0; i < pointList_.size(); i++) { + output.writeUInt32NoTag(pointList_.getInt(i)); + } if (getLockedPointListList().size() > 0) { output.writeUInt32NoTag(122); output.writeUInt32NoTag(lockedPointListMemoizedSerializedSize); @@ -473,31 +477,31 @@ public int getSerializedSize() { } { int dataSize = 0; - for (int i = 0; i < pointList_.size(); i++) { + for (int i = 0; i < hidePointList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(pointList_.getInt(i)); + .computeUInt32SizeNoTag(hidePointList_.getInt(i)); } size += dataSize; - if (!getPointListList().isEmpty()) { + if (!getHidePointListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - pointListMemoizedSerializedSize = dataSize; + hidePointListMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < hidePointList_.size(); i++) { + for (int i = 0; i < pointList_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(hidePointList_.getInt(i)); + .computeUInt32SizeNoTag(pointList_.getInt(i)); } size += dataSize; - if (!getHidePointListList().isEmpty()) { + if (!getPointListList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - hidePointListMemoizedSerializedSize = dataSize; + pointListMemoizedSerializedSize = dataSize; } { int dataSize = 0; @@ -532,10 +536,10 @@ public boolean equals(final java.lang.Object obj) { != other.getSceneId()) return false; if (!getUnhidePointListList() .equals(other.getUnhidePointListList())) return false; - if (!getPointListList() - .equals(other.getPointListList())) return false; if (!getHidePointListList() .equals(other.getHidePointListList())) return false; + if (!getPointListList() + .equals(other.getPointListList())) return false; if (!getLockedPointListList() .equals(other.getLockedPointListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -555,14 +559,14 @@ public int hashCode() { hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER; hash = (53 * hash) + getUnhidePointListList().hashCode(); } - if (getPointListCount() > 0) { - hash = (37 * hash) + POINT_LIST_FIELD_NUMBER; - hash = (53 * hash) + getPointListList().hashCode(); - } if (getHidePointListCount() > 0) { hash = (37 * hash) + HIDE_POINT_LIST_FIELD_NUMBER; hash = (53 * hash) + getHidePointListList().hashCode(); } + if (getPointListCount() > 0) { + hash = (37 * hash) + POINT_LIST_FIELD_NUMBER; + hash = (53 * hash) + getPointListList().hashCode(); + } if (getLockedPointListCount() > 0) { hash = (37 * hash) + LOCKED_POINT_LIST_FIELD_NUMBER; hash = (53 * hash) + getLockedPointListList().hashCode(); @@ -663,6 +667,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 21959
+     *
+ * * Protobuf type {@code ScenePointUnlockNotify} */ public static final class Builder extends @@ -704,9 +712,9 @@ public Builder clear() { unhidePointList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - pointList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); hidePointList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000002); + pointList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); lockedPointList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000008); @@ -744,15 +752,15 @@ public emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlo } result.unhidePointList_ = unhidePointList_; if (((bitField0_ & 0x00000002) != 0)) { - pointList_.makeImmutable(); + hidePointList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.pointList_ = pointList_; + result.hidePointList_ = hidePointList_; if (((bitField0_ & 0x00000004) != 0)) { - hidePointList_.makeImmutable(); + pointList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000004); } - result.hidePointList_ = hidePointList_; + result.pointList_ = pointList_; if (((bitField0_ & 0x00000008) != 0)) { lockedPointList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000008); @@ -819,23 +827,23 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterCl } onChanged(); } - if (!other.pointList_.isEmpty()) { - if (pointList_.isEmpty()) { - pointList_ = other.pointList_; + if (!other.hidePointList_.isEmpty()) { + if (hidePointList_.isEmpty()) { + hidePointList_ = other.hidePointList_; bitField0_ = (bitField0_ & ~0x00000002); } else { - ensurePointListIsMutable(); - pointList_.addAll(other.pointList_); + ensureHidePointListIsMutable(); + hidePointList_.addAll(other.hidePointList_); } onChanged(); } - if (!other.hidePointList_.isEmpty()) { - if (hidePointList_.isEmpty()) { - hidePointList_ = other.hidePointList_; + if (!other.pointList_.isEmpty()) { + if (pointList_.isEmpty()) { + pointList_ = other.pointList_; bitField0_ = (bitField0_ & ~0x00000004); } else { - ensureHidePointListIsMutable(); - hidePointList_.addAll(other.hidePointList_); + ensurePointListIsMutable(); + pointList_.addAll(other.pointList_); } onChanged(); } @@ -989,159 +997,159 @@ public Builder clearUnhidePointList() { return this; } - private com.google.protobuf.Internal.IntList pointList_ = emptyIntList(); - private void ensurePointListIsMutable() { + private com.google.protobuf.Internal.IntList hidePointList_ = emptyIntList(); + private void ensureHidePointListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { - pointList_ = mutableCopy(pointList_); + hidePointList_ = mutableCopy(hidePointList_); bitField0_ |= 0x00000002; } } /** - * repeated uint32 point_list = 11; - * @return A list containing the pointList. + * repeated uint32 hide_point_list = 11; + * @return A list containing the hidePointList. */ public java.util.List - getPointListList() { + getHidePointListList() { return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(pointList_) : pointList_; + java.util.Collections.unmodifiableList(hidePointList_) : hidePointList_; } /** - * repeated uint32 point_list = 11; - * @return The count of pointList. + * repeated uint32 hide_point_list = 11; + * @return The count of hidePointList. */ - public int getPointListCount() { - return pointList_.size(); + public int getHidePointListCount() { + return hidePointList_.size(); } /** - * repeated uint32 point_list = 11; + * repeated uint32 hide_point_list = 11; * @param index The index of the element to return. - * @return The pointList at the given index. + * @return The hidePointList at the given index. */ - public int getPointList(int index) { - return pointList_.getInt(index); + public int getHidePointList(int index) { + return hidePointList_.getInt(index); } /** - * repeated uint32 point_list = 11; + * repeated uint32 hide_point_list = 11; * @param index The index to set the value at. - * @param value The pointList to set. + * @param value The hidePointList to set. * @return This builder for chaining. */ - public Builder setPointList( + public Builder setHidePointList( int index, int value) { - ensurePointListIsMutable(); - pointList_.setInt(index, value); + ensureHidePointListIsMutable(); + hidePointList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 point_list = 11; - * @param value The pointList to add. + * repeated uint32 hide_point_list = 11; + * @param value The hidePointList to add. * @return This builder for chaining. */ - public Builder addPointList(int value) { - ensurePointListIsMutable(); - pointList_.addInt(value); + public Builder addHidePointList(int value) { + ensureHidePointListIsMutable(); + hidePointList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 point_list = 11; - * @param values The pointList to add. + * repeated uint32 hide_point_list = 11; + * @param values The hidePointList to add. * @return This builder for chaining. */ - public Builder addAllPointList( + public Builder addAllHidePointList( java.lang.Iterable values) { - ensurePointListIsMutable(); + ensureHidePointListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, pointList_); + values, hidePointList_); onChanged(); return this; } /** - * repeated uint32 point_list = 11; + * repeated uint32 hide_point_list = 11; * @return This builder for chaining. */ - public Builder clearPointList() { - pointList_ = emptyIntList(); + public Builder clearHidePointList() { + hidePointList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private com.google.protobuf.Internal.IntList hidePointList_ = emptyIntList(); - private void ensureHidePointListIsMutable() { + private com.google.protobuf.Internal.IntList pointList_ = emptyIntList(); + private void ensurePointListIsMutable() { if (!((bitField0_ & 0x00000004) != 0)) { - hidePointList_ = mutableCopy(hidePointList_); + pointList_ = mutableCopy(pointList_); bitField0_ |= 0x00000004; } } /** - * repeated uint32 hide_point_list = 13; - * @return A list containing the hidePointList. + * repeated uint32 point_list = 13; + * @return A list containing the pointList. */ public java.util.List - getHidePointListList() { + getPointListList() { return ((bitField0_ & 0x00000004) != 0) ? - java.util.Collections.unmodifiableList(hidePointList_) : hidePointList_; + java.util.Collections.unmodifiableList(pointList_) : pointList_; } /** - * repeated uint32 hide_point_list = 13; - * @return The count of hidePointList. + * repeated uint32 point_list = 13; + * @return The count of pointList. */ - public int getHidePointListCount() { - return hidePointList_.size(); + public int getPointListCount() { + return pointList_.size(); } /** - * repeated uint32 hide_point_list = 13; + * repeated uint32 point_list = 13; * @param index The index of the element to return. - * @return The hidePointList at the given index. + * @return The pointList at the given index. */ - public int getHidePointList(int index) { - return hidePointList_.getInt(index); + public int getPointList(int index) { + return pointList_.getInt(index); } /** - * repeated uint32 hide_point_list = 13; + * repeated uint32 point_list = 13; * @param index The index to set the value at. - * @param value The hidePointList to set. + * @param value The pointList to set. * @return This builder for chaining. */ - public Builder setHidePointList( + public Builder setPointList( int index, int value) { - ensureHidePointListIsMutable(); - hidePointList_.setInt(index, value); + ensurePointListIsMutable(); + pointList_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 hide_point_list = 13; - * @param value The hidePointList to add. + * repeated uint32 point_list = 13; + * @param value The pointList to add. * @return This builder for chaining. */ - public Builder addHidePointList(int value) { - ensureHidePointListIsMutable(); - hidePointList_.addInt(value); + public Builder addPointList(int value) { + ensurePointListIsMutable(); + pointList_.addInt(value); onChanged(); return this; } /** - * repeated uint32 hide_point_list = 13; - * @param values The hidePointList to add. + * repeated uint32 point_list = 13; + * @param values The pointList to add. * @return This builder for chaining. */ - public Builder addAllHidePointList( + public Builder addAllPointList( java.lang.Iterable values) { - ensureHidePointListIsMutable(); + ensurePointListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, hidePointList_); + values, pointList_); onChanged(); return this; } /** - * repeated uint32 hide_point_list = 13; + * repeated uint32 point_list = 13; * @return This builder for chaining. */ - public Builder clearHidePointList() { - hidePointList_ = emptyIntList(); + public Builder clearPointList() { + pointList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; @@ -1294,8 +1302,8 @@ public emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlo java.lang.String[] descriptorData = { "\n\034ScenePointUnlockNotify.proto\"\215\001\n\026Scene" + "PointUnlockNotify\022\020\n\010scene_id\030\003 \001(\r\022\031\n\021u" + - "nhide_point_list\030\004 \003(\r\022\022\n\npoint_list\030\013 \003" + - "(\r\022\027\n\017hide_point_list\030\r \003(\r\022\031\n\021locked_po" + + "nhide_point_list\030\004 \003(\r\022\027\n\017hide_point_lis" + + "t\030\013 \003(\r\022\022\n\npoint_list\030\r \003(\r\022\031\n\021locked_po" + "int_list\030\017 \003(\rB\033\n\031emu.grasscutter.net.pr" + "otob\006proto3" }; @@ -1308,7 +1316,7 @@ public emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlo internal_static_ScenePointUnlockNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ScenePointUnlockNotify_descriptor, - new java.lang.String[] { "SceneId", "UnhidePointList", "PointList", "HidePointList", "LockedPointList", }); + new java.lang.String[] { "SceneId", "UnhidePointList", "HidePointList", "PointList", "LockedPointList", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneWeatherForcastReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneWeatherForcastReqOuterClass.java index 7f96003cb57..50579c740a4 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SceneWeatherForcastReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneWeatherForcastReqOuterClass.java @@ -19,15 +19,15 @@ public interface SceneWeatherForcastReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 weather_area_id = 2; + * uint32 weather_area_id = 13; * @return The weatherAreaId. */ int getWeatherAreaId(); } /** * 
-   * CmdId: 27174
-   * Obf: DLNOGFFHMHA
+   * CmdId: 23364
+   * obf: AAHOGJGMIKI
    *
* * Protobuf type {@code SceneWeatherForcastReq} @@ -74,7 +74,7 @@ private SceneWeatherForcastReq( case 0: done = true; break; - case 16: { + case 104: { weatherAreaId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ private SceneWeatherForcastReq( emu.grasscutter.net.proto.SceneWeatherForcastReqOuterClass.SceneWeatherForcastReq.class, emu.grasscutter.net.proto.SceneWeatherForcastReqOuterClass.SceneWeatherForcastReq.Builder.class); } - public static final int WEATHER_AREA_ID_FIELD_NUMBER = 2; + public static final int WEATHER_AREA_ID_FIELD_NUMBER = 13; private int weatherAreaId_; /** - * uint32 weather_area_id = 2; + * uint32 weather_area_id = 13; * @return The weatherAreaId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (weatherAreaId_ != 0) { - output.writeUInt32(2, weatherAreaId_); + output.writeUInt32(13, weatherAreaId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (weatherAreaId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, weatherAreaId_); + .computeUInt32Size(13, weatherAreaId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27174
-     * Obf: DLNOGFFHMHA
+     * CmdId: 23364
+     * obf: AAHOGJGMIKI
      *
* * Protobuf type {@code SceneWeatherForcastReq} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int weatherAreaId_ ; /** - * uint32 weather_area_id = 2; + * uint32 weather_area_id = 13; * @return The weatherAreaId. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getWeatherAreaId() { return weatherAreaId_; } /** - * uint32 weather_area_id = 2; + * uint32 weather_area_id = 13; * @param value The weatherAreaId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setWeatherAreaId(int value) { return this; } /** - * uint32 weather_area_id = 2; + * uint32 weather_area_id = 13; * @return This builder for chaining. */ public Builder clearWeatherAreaId() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.SceneWeatherForcastReqOuterClass.SceneWeatherFo static { java.lang.String[] descriptorData = { "\n\034SceneWeatherForcastReq.proto\"1\n\026SceneW" + - "eatherForcastReq\022\027\n\017weather_area_id\030\002 \001(" + + "eatherForcastReq\022\027\n\017weather_area_id\030\r \001(" + "\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetBattlePassViewedReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetBattlePassViewedReqOuterClass.java index 8c39ce6e7de..2334b63f70d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SetBattlePassViewedReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SetBattlePassViewedReqOuterClass.java @@ -19,15 +19,15 @@ public interface SetBattlePassViewedReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 schedule_id = 2; + * uint32 schedule_id = 3; * @return The scheduleId. */ int getScheduleId(); } /** * 
-   * CmdId: 7320
-   * Obf: KKIGJEPPADN
+   * CmdId: 26483
+   * obf: KKIGJEPPADN
    *
* * Protobuf type {@code SetBattlePassViewedReq} @@ -74,7 +74,7 @@ private SetBattlePassViewedReq( case 0: done = true; break; - case 16: { + case 24: { scheduleId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ private SetBattlePassViewedReq( emu.grasscutter.net.proto.SetBattlePassViewedReqOuterClass.SetBattlePassViewedReq.class, emu.grasscutter.net.proto.SetBattlePassViewedReqOuterClass.SetBattlePassViewedReq.Builder.class); } - public static final int SCHEDULE_ID_FIELD_NUMBER = 2; + public static final int SCHEDULE_ID_FIELD_NUMBER = 3; private int scheduleId_; /** - * uint32 schedule_id = 2; + * uint32 schedule_id = 3; * @return The scheduleId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (scheduleId_ != 0) { - output.writeUInt32(2, scheduleId_); + output.writeUInt32(3, scheduleId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (scheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, scheduleId_); + .computeUInt32Size(3, scheduleId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 7320
-     * Obf: KKIGJEPPADN
+     * CmdId: 26483
+     * obf: KKIGJEPPADN
      *
* * Protobuf type {@code SetBattlePassViewedReq} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int scheduleId_ ; /** - * uint32 schedule_id = 2; + * uint32 schedule_id = 3; * @return The scheduleId. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getScheduleId() { return scheduleId_; } /** - * uint32 schedule_id = 2; + * uint32 schedule_id = 3; * @param value The scheduleId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setScheduleId(int value) { return this; } /** - * uint32 schedule_id = 2; + * uint32 schedule_id = 3; * @return This builder for chaining. */ public Builder clearScheduleId() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.SetBattlePassViewedReqOuterClass.SetBattlePassV static { java.lang.String[] descriptorData = { "\n\034SetBattlePassViewedReq.proto\"-\n\026SetBat" + - "tlePassViewedReq\022\023\n\013schedule_id\030\002 \001(\rB\033\n" + + "tlePassViewedReq\022\023\n\013schedule_id\030\003 \001(\rB\033\n" + "\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetBattlePassViewedRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetBattlePassViewedRspOuterClass.java index 7dcc42a8fc7..48b101f3cc4 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SetBattlePassViewedRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SetBattlePassViewedRspOuterClass.java @@ -19,21 +19,20 @@ public interface SetBattlePassViewedRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 schedule_id = 2; - * @return The scheduleId. + * int32 retcode = 3; + * @return The retcode. */ - int getScheduleId(); + int getRetcode(); /** - * int32 retcode = 6; - * @return The retcode. + * uint32 schedule_id = 14; + * @return The scheduleId. */ - int getRetcode(); + int getScheduleId(); } /** * 
-   * CmdId: 25281
-   * Obf: MMMKAPDNEHF
+   * CmdId: 9890
    *
* * Protobuf type {@code SetBattlePassViewedRsp} @@ -80,14 +79,14 @@ private SetBattlePassViewedRsp( case 0: done = true; break; - case 16: { + case 24: { - scheduleId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } - case 48: { + case 112: { - retcode_ = input.readInt32(); + scheduleId_ = input.readUInt32(); break; } default: { @@ -122,26 +121,26 @@ private SetBattlePassViewedRsp( emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp.class, emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp.Builder.class); } - public static final int SCHEDULE_ID_FIELD_NUMBER = 2; - private int scheduleId_; + public static final int RETCODE_FIELD_NUMBER = 3; + private int retcode_; /** - * uint32 schedule_id = 2; - * @return The scheduleId. + * int32 retcode = 3; + * @return The retcode. */ @java.lang.Override - public int getScheduleId() { - return scheduleId_; + public int getRetcode() { + return retcode_; } - public static final int RETCODE_FIELD_NUMBER = 6; - private int retcode_; + public static final int SCHEDULE_ID_FIELD_NUMBER = 14; + private int scheduleId_; /** - * int32 retcode = 6; - * @return The retcode. + * uint32 schedule_id = 14; + * @return The scheduleId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getScheduleId() { + return scheduleId_; } private byte memoizedIsInitialized = -1; @@ -158,11 +157,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (scheduleId_ != 0) { - output.writeUInt32(2, scheduleId_); - } if (retcode_ != 0) { - output.writeInt32(6, retcode_); + output.writeInt32(3, retcode_); + } + if (scheduleId_ != 0) { + output.writeUInt32(14, scheduleId_); } unknownFields.writeTo(output); } @@ -173,13 +172,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (scheduleId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, scheduleId_); + .computeInt32Size(3, retcode_); } - if (retcode_ != 0) { + if (scheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(6, retcode_); + .computeUInt32Size(14, scheduleId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +195,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp other = (emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp) obj; - if (getScheduleId() - != other.getScheduleId()) return false; if (getRetcode() != other.getRetcode()) return false; + if (getScheduleId() + != other.getScheduleId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +210,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER; - hash = (53 * hash) + getScheduleId(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER; + hash = (53 * hash) + getScheduleId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +311,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25281
-     * Obf: MMMKAPDNEHF
+     * CmdId: 9890
      *
* * Protobuf type {@code SetBattlePassViewedRsp} @@ -353,10 +351,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - scheduleId_ = 0; - retcode_ = 0; + scheduleId_ = 0; + return this; } @@ -383,8 +381,8 @@ public emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassV @java.lang.Override public emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp buildPartial() { emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp result = new emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp(this); - result.scheduleId_ = scheduleId_; result.retcode_ = retcode_; + result.scheduleId_ = scheduleId_; onBuilt(); return result; } @@ -433,12 +431,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp other) { if (other == emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassViewedRsp.getDefaultInstance()) return this; - if (other.getScheduleId() != 0) { - setScheduleId(other.getScheduleId()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } + if (other.getScheduleId() != 0) { + setScheduleId(other.getScheduleId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +466,64 @@ public Builder mergeFrom( return this; } - private int scheduleId_ ; + private int retcode_ ; /** - * uint32 schedule_id = 2; - * @return The scheduleId. + * int32 retcode = 3; + * @return The retcode. */ @java.lang.Override - public int getScheduleId() { - return scheduleId_; + public int getRetcode() { + return retcode_; } /** - * uint32 schedule_id = 2; - * @param value The scheduleId to set. + * int32 retcode = 3; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setScheduleId(int value) { + public Builder setRetcode(int value) { - scheduleId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 schedule_id = 2; + * int32 retcode = 3; * @return This builder for chaining. */ - public Builder clearScheduleId() { + public Builder clearRetcode() { - scheduleId_ = 0; + retcode_ = 0; onChanged(); return this; } - private int retcode_ ; + private int scheduleId_ ; /** - * int32 retcode = 6; - * @return The retcode. + * uint32 schedule_id = 14; + * @return The scheduleId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getScheduleId() { + return scheduleId_; } /** - * int32 retcode = 6; - * @param value The retcode to set. + * uint32 schedule_id = 14; + * @param value The scheduleId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setScheduleId(int value) { - retcode_ = value; + scheduleId_ = value; onChanged(); return this; } /** - * int32 retcode = 6; + * uint32 schedule_id = 14; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearScheduleId() { - retcode_ = 0; + scheduleId_ = 0; onChanged(); return this; } @@ -597,8 +595,8 @@ public emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassV static { java.lang.String[] descriptorData = { "\n\034SetBattlePassViewedRsp.proto\">\n\026SetBat" + - "tlePassViewedRsp\022\023\n\013schedule_id\030\002 \001(\r\022\017\n" + - "\007retcode\030\006 \001(\005B\033\n\031emu.grasscutter.net.pr" + + "tlePassViewedRsp\022\017\n\007retcode\030\003 \001(\005\022\023\n\013sch" + + "edule_id\030\016 \001(\rB\033\n\031emu.grasscutter.net.pr" + "otob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +608,7 @@ public emu.grasscutter.net.proto.SetBattlePassViewedRspOuterClass.SetBattlePassV internal_static_SetBattlePassViewedRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SetBattlePassViewedRsp_descriptor, - new java.lang.String[] { "ScheduleId", "Retcode", }); + new java.lang.String[] { "Retcode", "ScheduleId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetCoopChapterViewedRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetCoopChapterViewedRspOuterClass.java index f255cacee99..a1b4bbbfa6a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SetCoopChapterViewedRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SetCoopChapterViewedRspOuterClass.java @@ -19,21 +19,20 @@ public interface SetCoopChapterViewedRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 12; - * @return The retcode. + * uint32 chapter_id = 3; + * @return The chapterId. */ - int getRetcode(); + int getChapterId(); /** - * uint32 chapter_id = 6; - * @return The chapterId. + * int32 retcode = 8; + * @return The retcode. */ - int getChapterId(); + int getRetcode(); } /** * 
-   * CmdId: 23389
-   * Obf: AIFNGABDBJK
+   * CmdId: 2246
    *
* * Protobuf type {@code SetCoopChapterViewedRsp} @@ -80,12 +79,12 @@ private SetCoopChapterViewedRsp( case 0: done = true; break; - case 48: { + case 24: { chapterId_ = input.readUInt32(); break; } - case 96: { + case 64: { retcode_ = input.readInt32(); break; @@ -122,26 +121,26 @@ private SetCoopChapterViewedRsp( emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp.class, emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 12; - private int retcode_; + public static final int CHAPTER_ID_FIELD_NUMBER = 3; + private int chapterId_; /** - * int32 retcode = 12; - * @return The retcode. + * uint32 chapter_id = 3; + * @return The chapterId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getChapterId() { + return chapterId_; } - public static final int CHAPTER_ID_FIELD_NUMBER = 6; - private int chapterId_; + public static final int RETCODE_FIELD_NUMBER = 8; + private int retcode_; /** - * uint32 chapter_id = 6; - * @return The chapterId. + * int32 retcode = 8; + * @return The retcode. */ @java.lang.Override - public int getChapterId() { - return chapterId_; + public int getRetcode() { + return retcode_; } private byte memoizedIsInitialized = -1; @@ -159,10 +158,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (chapterId_ != 0) { - output.writeUInt32(6, chapterId_); + output.writeUInt32(3, chapterId_); } if (retcode_ != 0) { - output.writeInt32(12, retcode_); + output.writeInt32(8, retcode_); } unknownFields.writeTo(output); } @@ -175,11 +174,11 @@ public int getSerializedSize() { size = 0; if (chapterId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, chapterId_); + .computeUInt32Size(3, chapterId_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(12, retcode_); + .computeInt32Size(8, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +195,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp other = (emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; if (getChapterId() != other.getChapterId()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +210,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + CHAPTER_ID_FIELD_NUMBER; hash = (53 * hash) + getChapterId(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +311,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23389
-     * Obf: AIFNGABDBJK
+     * CmdId: 2246
      *
* * Protobuf type {@code SetCoopChapterViewedRsp} @@ -353,10 +351,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; - chapterId_ = 0; + retcode_ = 0; + return this; } @@ -383,8 +381,8 @@ public emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapte @java.lang.Override public emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp buildPartial() { emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp result = new emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp(this); - result.retcode_ = retcode_; result.chapterId_ = chapterId_; + result.retcode_ = retcode_; onBuilt(); return result; } @@ -433,12 +431,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp other) { if (other == emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapterViewedRsp.getDefaultInstance()) return this; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (other.getChapterId() != 0) { setChapterId(other.getChapterId()); } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +466,64 @@ public Builder mergeFrom( return this; } - private int retcode_ ; + private int chapterId_ ; /** - * int32 retcode = 12; - * @return The retcode. + * uint32 chapter_id = 3; + * @return The chapterId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getChapterId() { + return chapterId_; } /** - * int32 retcode = 12; - * @param value The retcode to set. + * uint32 chapter_id = 3; + * @param value The chapterId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setChapterId(int value) { - retcode_ = value; + chapterId_ = value; onChanged(); return this; } /** - * int32 retcode = 12; + * uint32 chapter_id = 3; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearChapterId() { - retcode_ = 0; + chapterId_ = 0; onChanged(); return this; } - private int chapterId_ ; + private int retcode_ ; /** - * uint32 chapter_id = 6; - * @return The chapterId. + * int32 retcode = 8; + * @return The retcode. */ @java.lang.Override - public int getChapterId() { - return chapterId_; + public int getRetcode() { + return retcode_; } /** - * uint32 chapter_id = 6; - * @param value The chapterId to set. + * int32 retcode = 8; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setChapterId(int value) { + public Builder setRetcode(int value) { - chapterId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 chapter_id = 6; + * int32 retcode = 8; * @return This builder for chaining. */ - public Builder clearChapterId() { + public Builder clearRetcode() { - chapterId_ = 0; + retcode_ = 0; onChanged(); return this; } @@ -597,8 +595,8 @@ public emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapte static { java.lang.String[] descriptorData = { "\n\035SetCoopChapterViewedRsp.proto\">\n\027SetCo" + - "opChapterViewedRsp\022\017\n\007retcode\030\014 \001(\005\022\022\n\nc" + - "hapter_id\030\006 \001(\rB\033\n\031emu.grasscutter.net.p" + + "opChapterViewedRsp\022\022\n\nchapter_id\030\003 \001(\r\022\017" + + "\n\007retcode\030\010 \001(\005B\033\n\031emu.grasscutter.net.p" + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +608,7 @@ public emu.grasscutter.net.proto.SetCoopChapterViewedRspOuterClass.SetCoopChapte internal_static_SetCoopChapterViewedRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SetCoopChapterViewedRsp_descriptor, - new java.lang.String[] { "Retcode", "ChapterId", }); + new java.lang.String[] { "ChapterId", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataRspOuterClass.java index 943d2172f78..ac51efcb50b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataRspOuterClass.java @@ -25,6 +25,10 @@ public interface SetPlayerBornDataRspOrBuilder extends int getRetcode(); } /** + * 
+   * CmdId: 26454
+   *
+ * * Protobuf type {@code SetPlayerBornDataRsp} */ public static final class SetPlayerBornDataRsp extends @@ -273,6 +277,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 26454
+     *
+ * * Protobuf type {@code SetPlayerBornDataRsp} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShapeBoxOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShapeBoxOuterClass.java index 45a4d7b5342..2ee65c71555 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ShapeBoxOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ShapeBoxOuterClass.java @@ -94,10 +94,6 @@ public interface ShapeBoxOrBuilder extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getExtentsOrBuilder(); } /** - * 
-   * Obf: BFCLKLDHKOM
-   *
- * * Protobuf type {@code ShapeBox} */ public static final class ShapeBox extends @@ -594,10 +590,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: BFCLKLDHKOM
-     *
- * * Protobuf type {@code ShapeBox} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShapeSphereOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShapeSphereOuterClass.java index de031ef80d6..3f183d4d2fa 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ShapeSphereOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ShapeSphereOuterClass.java @@ -40,10 +40,6 @@ public interface ShapeSphereOrBuilder extends float getRadius(); } /** - * 
-   * Obf: KJNACIDANGB
-   *
- * * Protobuf type {@code ShapeSphere} */ public static final class ShapeSphere extends @@ -349,10 +345,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: KJNACIDANGB
-     *
- * * Protobuf type {@code ShapeSphere} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java index 63f44ef7261..c7a72e6ff7f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java @@ -19,16 +19,60 @@ public interface ShopGoodsOrBuilder extends com.google.protobuf.MessageOrBuilder { /** + * 
+     * 5.0 update 可能不一定对
+     *
+ * * uint32 goods_id = 1; * @return The goodsId. */ int getGoodsId(); /** - * uint32 begin_time = 2; - * @return The beginTime. + * 
+     * 原石 确定是对的
+     *
+ * + * uint32 hcoin = 8; + * @return The hcoin. */ - int getBeginTime(); + int getHcoin(); + + /** + * 
+     * 结晶?  可能不对
+     *
+ * + * uint32 mcoin = 5; + * @return The mcoin. + */ + int getMcoin(); + + /** + * 
+     * 摩拉? 可能不对
+     *
+ * + * uint32 scoin = 10; + * @return The scoin. + */ + int getScoin(); + + /** + * 
+     * 虚假的值 
+     *
+ * + * uint32 buy_limit = 7; + * @return The buyLimit. + */ + int getBuyLimit(); + + /** + * uint32 min_level = 11; + * @return The minLevel. + */ + int getMinLevel(); /** * uint32 next_refresh_time = 3; @@ -43,55 +87,65 @@ public interface ShopGoodsOrBuilder extends int getDisableType(); /** - * uint32 mcoin = 5; - * @return The mcoin. + * uint32 max_level = 590; + * @return The maxLevel. */ - int getMcoin(); + int getMaxLevel(); /** - * .ItemParam goods_item = 6; - * @return Whether the goodsItem field is set. + * uint32 discount_id = 106; + * @return The discountId. */ - boolean hasGoodsItem(); + int getDiscountId(); + /** - * .ItemParam goods_item = 6; - * @return The goodsItem. + * uint32 discount_begin_time = 107; + * @return The discountBeginTime. */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem(); + int getDiscountBeginTime(); + /** - * .ItemParam goods_item = 6; + * uint32 discount_end_time = 108; + * @return The discountEndTime. */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder(); + int getDiscountEndTime(); /** - * uint32 buy_limit = 7; - * @return The buyLimit. + * uint32 single_limit = 109; + * @return The singleLimit. */ - int getBuyLimit(); + int getSingleLimit(); /** - * uint32 hcoin = 8; - * @return The hcoin. + * uint32 secondary_sheet_id = 110; + * @return The secondarySheetId. */ - int getHcoin(); + int getSecondarySheetId(); /** - * uint32 IBCGFFJGCID = 9; - * @return The iBCGFFJGCID. + * 
+     * 大概率对的 
+     *
+ * + * bool EHIAIOONFDH = 1748; + * @return The eHIAIOONFDH. */ - int getIBCGFFJGCID(); + boolean getEHIAIOONFDH(); /** - * uint32 scoin = 10; - * @return The scoin. + * .ItemParam goods_item = 6; + * @return Whether the goodsItem field is set. */ - int getScoin(); - + boolean hasGoodsItem(); /** - * uint32 min_level = 11; - * @return The minLevel. + * .ItemParam goods_item = 6; + * @return The goodsItem. */ - int getMinLevel(); + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem(); + /** + * .ItemParam goods_item = 6; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder(); /** * repeated .ItemParam cost_item_list = 12; @@ -141,46 +195,16 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemList int getBoughtNum(); /** - * uint32 end_time = 15; - * @return The endTime. - */ - int getEndTime(); - - /** - * uint32 max_level = 590; - * @return The maxLevel. - */ - int getMaxLevel(); - - /** - * uint32 BHNAJCLPOJE = 1487; - * @return The bHNAJCLPOJE. - */ - int getBHNAJCLPOJE(); - - /** - * uint32 KJAGOOHCNON = 1541; - * @return The kJAGOOHCNON. - */ - int getKJAGOOHCNON(); - - /** - * uint32 AFOGAPGJCOH = 1587; - * @return The aFOGAPGJCOH. - */ - int getAFOGAPGJCOH(); - - /** - * bool EHIAIOONFDH = 1748; - * @return The eHIAIOONFDH. + * uint32 begin_time = 2; + * @return The beginTime. */ - boolean getEHIAIOONFDH(); + int getBeginTime(); /** - * uint32 MNCAAIMGCJJ = 1942; - * @return The mNCAAIMGCJJ. + * uint32 end_time = 15; + * @return The endTime. */ - int getMNCAAIMGCJJ(); + int getEndTime(); } /** * Protobuf type {@code ShopGoods} @@ -278,11 +302,6 @@ private ShopGoods( hcoin_ = input.readUInt32(); break; } - case 72: { - - iBCGFFJGCID_ = input.readUInt32(); - break; - } case 80: { scoin_ = input.readUInt32(); @@ -333,34 +352,39 @@ private ShopGoods( endTime_ = input.readUInt32(); break; } - case 4720: { + case 848: { - maxLevel_ = input.readUInt32(); + discountId_ = input.readUInt32(); break; } - case 11896: { + case 856: { - bHNAJCLPOJE_ = input.readUInt32(); + discountBeginTime_ = input.readUInt32(); break; } - case 12328: { + case 864: { - kJAGOOHCNON_ = input.readUInt32(); + discountEndTime_ = input.readUInt32(); break; } - case 12696: { + case 872: { - aFOGAPGJCOH_ = input.readUInt32(); + singleLimit_ = input.readUInt32(); break; } - case 13984: { + case 880: { - eHIAIOONFDH_ = input.readBool(); + secondarySheetId_ = input.readUInt32(); + break; + } + case 4720: { + + maxLevel_ = input.readUInt32(); break; } - case 15536: { + case 13984: { - mNCAAIMGCJJ_ = input.readUInt32(); + eHIAIOONFDH_ = input.readBool(); break; } default: { @@ -404,6 +428,10 @@ private ShopGoods( public static final int GOODS_ID_FIELD_NUMBER = 1; private int goodsId_; /** + * 
+     * 5.0 update 可能不一定对
+     *
+ * * uint32 goods_id = 1; * @return The goodsId. */ @@ -412,15 +440,75 @@ public int getGoodsId() { return goodsId_; } - public static final int BEGIN_TIME_FIELD_NUMBER = 2; - private int beginTime_; + public static final int HCOIN_FIELD_NUMBER = 8; + private int hcoin_; /** - * uint32 begin_time = 2; - * @return The beginTime. + * 
+     * 原石 确定是对的
+     *
+ * + * uint32 hcoin = 8; + * @return The hcoin. */ @java.lang.Override - public int getBeginTime() { - return beginTime_; + public int getHcoin() { + return hcoin_; + } + + public static final int MCOIN_FIELD_NUMBER = 5; + private int mcoin_; + /** + * 
+     * 结晶?  可能不对
+     *
+ * + * uint32 mcoin = 5; + * @return The mcoin. + */ + @java.lang.Override + public int getMcoin() { + return mcoin_; + } + + public static final int SCOIN_FIELD_NUMBER = 10; + private int scoin_; + /** + * 
+     * 摩拉? 可能不对
+     *
+ * + * uint32 scoin = 10; + * @return The scoin. + */ + @java.lang.Override + public int getScoin() { + return scoin_; + } + + public static final int BUY_LIMIT_FIELD_NUMBER = 7; + private int buyLimit_; + /** + * 
+     * 虚假的值 
+     *
+ * + * uint32 buy_limit = 7; + * @return The buyLimit. + */ + @java.lang.Override + public int getBuyLimit() { + return buyLimit_; + } + + public static final int MIN_LEVEL_FIELD_NUMBER = 11; + private int minLevel_; + /** + * uint32 min_level = 11; + * @return The minLevel. + */ + @java.lang.Override + public int getMinLevel() { + return minLevel_; } public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 3; @@ -445,96 +533,111 @@ public int getDisableType() { return disableType_; } - public static final int MCOIN_FIELD_NUMBER = 5; - private int mcoin_; + public static final int MAX_LEVEL_FIELD_NUMBER = 590; + private int maxLevel_; /** - * uint32 mcoin = 5; - * @return The mcoin. + * uint32 max_level = 590; + * @return The maxLevel. */ @java.lang.Override - public int getMcoin() { - return mcoin_; + public int getMaxLevel() { + return maxLevel_; } - public static final int GOODS_ITEM_FIELD_NUMBER = 6; - private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam goodsItem_; + public static final int DISCOUNT_ID_FIELD_NUMBER = 106; + private int discountId_; /** - * .ItemParam goods_item = 6; - * @return Whether the goodsItem field is set. + * uint32 discount_id = 106; + * @return The discountId. */ @java.lang.Override - public boolean hasGoodsItem() { - return goodsItem_ != null; + public int getDiscountId() { + return discountId_; } + + public static final int DISCOUNT_BEGIN_TIME_FIELD_NUMBER = 107; + private int discountBeginTime_; /** - * .ItemParam goods_item = 6; - * @return The goodsItem. + * uint32 discount_begin_time = 107; + * @return The discountBeginTime. */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem() { - return goodsItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_; + public int getDiscountBeginTime() { + return discountBeginTime_; } + + public static final int DISCOUNT_END_TIME_FIELD_NUMBER = 108; + private int discountEndTime_; /** - * .ItemParam goods_item = 6; + * uint32 discount_end_time = 108; + * @return The discountEndTime. */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder() { - return getGoodsItem(); + public int getDiscountEndTime() { + return discountEndTime_; } - public static final int BUY_LIMIT_FIELD_NUMBER = 7; - private int buyLimit_; + public static final int SINGLE_LIMIT_FIELD_NUMBER = 109; + private int singleLimit_; /** - * uint32 buy_limit = 7; - * @return The buyLimit. + * uint32 single_limit = 109; + * @return The singleLimit. */ @java.lang.Override - public int getBuyLimit() { - return buyLimit_; + public int getSingleLimit() { + return singleLimit_; } - public static final int HCOIN_FIELD_NUMBER = 8; - private int hcoin_; + public static final int SECONDARY_SHEET_ID_FIELD_NUMBER = 110; + private int secondarySheetId_; /** - * uint32 hcoin = 8; - * @return The hcoin. + * uint32 secondary_sheet_id = 110; + * @return The secondarySheetId. */ @java.lang.Override - public int getHcoin() { - return hcoin_; + public int getSecondarySheetId() { + return secondarySheetId_; } - public static final int IBCGFFJGCID_FIELD_NUMBER = 9; - private int iBCGFFJGCID_; + public static final int EHIAIOONFDH_FIELD_NUMBER = 1748; + private boolean eHIAIOONFDH_; /** - * uint32 IBCGFFJGCID = 9; - * @return The iBCGFFJGCID. + * 
+     * 大概率对的 
+     *
+ * + * bool EHIAIOONFDH = 1748; + * @return The eHIAIOONFDH. */ @java.lang.Override - public int getIBCGFFJGCID() { - return iBCGFFJGCID_; + public boolean getEHIAIOONFDH() { + return eHIAIOONFDH_; } - public static final int SCOIN_FIELD_NUMBER = 10; - private int scoin_; + public static final int GOODS_ITEM_FIELD_NUMBER = 6; + private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam goodsItem_; /** - * uint32 scoin = 10; - * @return The scoin. + * .ItemParam goods_item = 6; + * @return Whether the goodsItem field is set. */ @java.lang.Override - public int getScoin() { - return scoin_; + public boolean hasGoodsItem() { + return goodsItem_ != null; } - - public static final int MIN_LEVEL_FIELD_NUMBER = 11; - private int minLevel_; /** - * uint32 min_level = 11; - * @return The minLevel. + * .ItemParam goods_item = 6; + * @return The goodsItem. */ @java.lang.Override - public int getMinLevel() { - return minLevel_; + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem() { + return goodsItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_; + } + /** + * .ItemParam goods_item = 6; + */ + @java.lang.Override + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder() { + return getGoodsItem(); } public static final int COST_ITEM_LIST_FIELD_NUMBER = 12; @@ -616,81 +719,26 @@ public int getBoughtNum() { return boughtNum_; } - public static final int END_TIME_FIELD_NUMBER = 15; - private int endTime_; + public static final int BEGIN_TIME_FIELD_NUMBER = 2; + private int beginTime_; /** - * uint32 end_time = 15; - * @return The endTime. + * uint32 begin_time = 2; + * @return The beginTime. */ @java.lang.Override - public int getEndTime() { - return endTime_; - } - - public static final int MAX_LEVEL_FIELD_NUMBER = 590; - private int maxLevel_; - /** - * uint32 max_level = 590; - * @return The maxLevel. - */ - @java.lang.Override - public int getMaxLevel() { - return maxLevel_; - } - - public static final int BHNAJCLPOJE_FIELD_NUMBER = 1487; - private int bHNAJCLPOJE_; - /** - * uint32 BHNAJCLPOJE = 1487; - * @return The bHNAJCLPOJE. - */ - @java.lang.Override - public int getBHNAJCLPOJE() { - return bHNAJCLPOJE_; - } - - public static final int KJAGOOHCNON_FIELD_NUMBER = 1541; - private int kJAGOOHCNON_; - /** - * uint32 KJAGOOHCNON = 1541; - * @return The kJAGOOHCNON. - */ - @java.lang.Override - public int getKJAGOOHCNON() { - return kJAGOOHCNON_; - } - - public static final int AFOGAPGJCOH_FIELD_NUMBER = 1587; - private int aFOGAPGJCOH_; - /** - * uint32 AFOGAPGJCOH = 1587; - * @return The aFOGAPGJCOH. - */ - @java.lang.Override - public int getAFOGAPGJCOH() { - return aFOGAPGJCOH_; - } - - public static final int EHIAIOONFDH_FIELD_NUMBER = 1748; - private boolean eHIAIOONFDH_; - /** - * bool EHIAIOONFDH = 1748; - * @return The eHIAIOONFDH. - */ - @java.lang.Override - public boolean getEHIAIOONFDH() { - return eHIAIOONFDH_; + public int getBeginTime() { + return beginTime_; } - public static final int MNCAAIMGCJJ_FIELD_NUMBER = 1942; - private int mNCAAIMGCJJ_; + public static final int END_TIME_FIELD_NUMBER = 15; + private int endTime_; /** - * uint32 MNCAAIMGCJJ = 1942; - * @return The mNCAAIMGCJJ. + * uint32 end_time = 15; + * @return The endTime. */ @java.lang.Override - public int getMNCAAIMGCJJ() { - return mNCAAIMGCJJ_; + public int getEndTime() { + return endTime_; } private byte memoizedIsInitialized = -1; @@ -732,9 +780,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (hcoin_ != 0) { output.writeUInt32(8, hcoin_); } - if (iBCGFFJGCID_ != 0) { - output.writeUInt32(9, iBCGFFJGCID_); - } if (scoin_ != 0) { output.writeUInt32(10, scoin_); } @@ -757,24 +802,27 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (endTime_ != 0) { output.writeUInt32(15, endTime_); } - if (maxLevel_ != 0) { - output.writeUInt32(590, maxLevel_); + if (discountId_ != 0) { + output.writeUInt32(106, discountId_); + } + if (discountBeginTime_ != 0) { + output.writeUInt32(107, discountBeginTime_); } - if (bHNAJCLPOJE_ != 0) { - output.writeUInt32(1487, bHNAJCLPOJE_); + if (discountEndTime_ != 0) { + output.writeUInt32(108, discountEndTime_); } - if (kJAGOOHCNON_ != 0) { - output.writeUInt32(1541, kJAGOOHCNON_); + if (singleLimit_ != 0) { + output.writeUInt32(109, singleLimit_); } - if (aFOGAPGJCOH_ != 0) { - output.writeUInt32(1587, aFOGAPGJCOH_); + if (secondarySheetId_ != 0) { + output.writeUInt32(110, secondarySheetId_); + } + if (maxLevel_ != 0) { + output.writeUInt32(590, maxLevel_); } if (eHIAIOONFDH_ != false) { output.writeBool(1748, eHIAIOONFDH_); } - if (mNCAAIMGCJJ_ != 0) { - output.writeUInt32(1942, mNCAAIMGCJJ_); - } unknownFields.writeTo(output); } @@ -816,10 +864,6 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(8, hcoin_); } - if (iBCGFFJGCID_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, iBCGFFJGCID_); - } if (scoin_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(10, scoin_); @@ -854,29 +898,33 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(15, endTime_); } - if (maxLevel_ != 0) { + if (discountId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(590, maxLevel_); + .computeUInt32Size(106, discountId_); } - if (bHNAJCLPOJE_ != 0) { + if (discountBeginTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1487, bHNAJCLPOJE_); + .computeUInt32Size(107, discountBeginTime_); } - if (kJAGOOHCNON_ != 0) { + if (discountEndTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1541, kJAGOOHCNON_); + .computeUInt32Size(108, discountEndTime_); } - if (aFOGAPGJCOH_ != 0) { + if (singleLimit_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1587, aFOGAPGJCOH_); + .computeUInt32Size(109, singleLimit_); } - if (eHIAIOONFDH_ != false) { + if (secondarySheetId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1748, eHIAIOONFDH_); + .computeUInt32Size(110, secondarySheetId_); + } + if (maxLevel_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(590, maxLevel_); } - if (mNCAAIMGCJJ_ != 0) { + if (eHIAIOONFDH_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1942, mNCAAIMGCJJ_); + .computeBoolSize(1748, eHIAIOONFDH_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -895,49 +943,49 @@ public boolean equals(final java.lang.Object obj) { if (getGoodsId() != other.getGoodsId()) return false; - if (getBeginTime() - != other.getBeginTime()) return false; + if (getHcoin() + != other.getHcoin()) return false; + if (getMcoin() + != other.getMcoin()) return false; + if (getScoin() + != other.getScoin()) return false; + if (getBuyLimit() + != other.getBuyLimit()) return false; + if (getMinLevel() + != other.getMinLevel()) return false; if (getNextRefreshTime() != other.getNextRefreshTime()) return false; if (getDisableType() != other.getDisableType()) return false; - if (getMcoin() - != other.getMcoin()) return false; + if (getMaxLevel() + != other.getMaxLevel()) return false; + if (getDiscountId() + != other.getDiscountId()) return false; + if (getDiscountBeginTime() + != other.getDiscountBeginTime()) return false; + if (getDiscountEndTime() + != other.getDiscountEndTime()) return false; + if (getSingleLimit() + != other.getSingleLimit()) return false; + if (getSecondarySheetId() + != other.getSecondarySheetId()) return false; + if (getEHIAIOONFDH() + != other.getEHIAIOONFDH()) return false; if (hasGoodsItem() != other.hasGoodsItem()) return false; if (hasGoodsItem()) { if (!getGoodsItem() .equals(other.getGoodsItem())) return false; } - if (getBuyLimit() - != other.getBuyLimit()) return false; - if (getHcoin() - != other.getHcoin()) return false; - if (getIBCGFFJGCID() - != other.getIBCGFFJGCID()) return false; - if (getScoin() - != other.getScoin()) return false; - if (getMinLevel() - != other.getMinLevel()) return false; if (!getCostItemListList() .equals(other.getCostItemListList())) return false; if (!getPreGoodsIdListList() .equals(other.getPreGoodsIdListList())) return false; if (getBoughtNum() != other.getBoughtNum()) return false; + if (getBeginTime() + != other.getBeginTime()) return false; if (getEndTime() != other.getEndTime()) return false; - if (getMaxLevel() - != other.getMaxLevel()) return false; - if (getBHNAJCLPOJE() - != other.getBHNAJCLPOJE()) return false; - if (getKJAGOOHCNON() - != other.getKJAGOOHCNON()) return false; - if (getAFOGAPGJCOH() - != other.getAFOGAPGJCOH()) return false; - if (getEHIAIOONFDH() - != other.getEHIAIOONFDH()) return false; - if (getMNCAAIMGCJJ() - != other.getMNCAAIMGCJJ()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -951,28 +999,39 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + GOODS_ID_FIELD_NUMBER; hash = (53 * hash) + getGoodsId(); - hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER; - hash = (53 * hash) + getBeginTime(); + hash = (37 * hash) + HCOIN_FIELD_NUMBER; + hash = (53 * hash) + getHcoin(); + hash = (37 * hash) + MCOIN_FIELD_NUMBER; + hash = (53 * hash) + getMcoin(); + hash = (37 * hash) + SCOIN_FIELD_NUMBER; + hash = (53 * hash) + getScoin(); + hash = (37 * hash) + BUY_LIMIT_FIELD_NUMBER; + hash = (53 * hash) + getBuyLimit(); + hash = (37 * hash) + MIN_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getMinLevel(); hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER; hash = (53 * hash) + getNextRefreshTime(); hash = (37 * hash) + DISABLE_TYPE_FIELD_NUMBER; hash = (53 * hash) + getDisableType(); - hash = (37 * hash) + MCOIN_FIELD_NUMBER; - hash = (53 * hash) + getMcoin(); + hash = (37 * hash) + MAX_LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getMaxLevel(); + hash = (37 * hash) + DISCOUNT_ID_FIELD_NUMBER; + hash = (53 * hash) + getDiscountId(); + hash = (37 * hash) + DISCOUNT_BEGIN_TIME_FIELD_NUMBER; + hash = (53 * hash) + getDiscountBeginTime(); + hash = (37 * hash) + DISCOUNT_END_TIME_FIELD_NUMBER; + hash = (53 * hash) + getDiscountEndTime(); + hash = (37 * hash) + SINGLE_LIMIT_FIELD_NUMBER; + hash = (53 * hash) + getSingleLimit(); + hash = (37 * hash) + SECONDARY_SHEET_ID_FIELD_NUMBER; + hash = (53 * hash) + getSecondarySheetId(); + hash = (37 * hash) + EHIAIOONFDH_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getEHIAIOONFDH()); if (hasGoodsItem()) { hash = (37 * hash) + GOODS_ITEM_FIELD_NUMBER; hash = (53 * hash) + getGoodsItem().hashCode(); } - hash = (37 * hash) + BUY_LIMIT_FIELD_NUMBER; - hash = (53 * hash) + getBuyLimit(); - hash = (37 * hash) + HCOIN_FIELD_NUMBER; - hash = (53 * hash) + getHcoin(); - hash = (37 * hash) + IBCGFFJGCID_FIELD_NUMBER; - hash = (53 * hash) + getIBCGFFJGCID(); - hash = (37 * hash) + SCOIN_FIELD_NUMBER; - hash = (53 * hash) + getScoin(); - hash = (37 * hash) + MIN_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getMinLevel(); if (getCostItemListCount() > 0) { hash = (37 * hash) + COST_ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getCostItemListList().hashCode(); @@ -983,21 +1042,10 @@ public int hashCode() { } hash = (37 * hash) + BOUGHT_NUM_FIELD_NUMBER; hash = (53 * hash) + getBoughtNum(); + hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER; + hash = (53 * hash) + getBeginTime(); hash = (37 * hash) + END_TIME_FIELD_NUMBER; hash = (53 * hash) + getEndTime(); - hash = (37 * hash) + MAX_LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getMaxLevel(); - hash = (37 * hash) + BHNAJCLPOJE_FIELD_NUMBER; - hash = (53 * hash) + getBHNAJCLPOJE(); - hash = (37 * hash) + KJAGOOHCNON_FIELD_NUMBER; - hash = (53 * hash) + getKJAGOOHCNON(); - hash = (37 * hash) + AFOGAPGJCOH_FIELD_NUMBER; - hash = (53 * hash) + getAFOGAPGJCOH(); - hash = (37 * hash) + EHIAIOONFDH_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getEHIAIOONFDH()); - hash = (37 * hash) + MNCAAIMGCJJ_FIELD_NUMBER; - hash = (53 * hash) + getMNCAAIMGCJJ(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1134,13 +1182,33 @@ public Builder clear() { super.clear(); goodsId_ = 0; - beginTime_ = 0; + hcoin_ = 0; + + mcoin_ = 0; + + scoin_ = 0; + + buyLimit_ = 0; + + minLevel_ = 0; nextRefreshTime_ = 0; disableType_ = 0; - mcoin_ = 0; + maxLevel_ = 0; + + discountId_ = 0; + + discountBeginTime_ = 0; + + discountEndTime_ = 0; + + singleLimit_ = 0; + + secondarySheetId_ = 0; + + eHIAIOONFDH_ = false; if (goodsItemBuilder_ == null) { goodsItem_ = null; @@ -1148,16 +1216,6 @@ public Builder clear() { goodsItem_ = null; goodsItemBuilder_ = null; } - buyLimit_ = 0; - - hcoin_ = 0; - - iBCGFFJGCID_ = 0; - - scoin_ = 0; - - minLevel_ = 0; - if (costItemListBuilder_ == null) { costItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); @@ -1168,19 +1226,9 @@ public Builder clear() { bitField0_ = (bitField0_ & ~0x00000002); boughtNum_ = 0; - endTime_ = 0; - - maxLevel_ = 0; - - bHNAJCLPOJE_ = 0; - - kJAGOOHCNON_ = 0; - - aFOGAPGJCOH_ = 0; - - eHIAIOONFDH_ = false; + beginTime_ = 0; - mNCAAIMGCJJ_ = 0; + endTime_ = 0; return this; } @@ -1210,20 +1258,25 @@ public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods buildPartial() { emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods result = new emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods(this); int from_bitField0_ = bitField0_; result.goodsId_ = goodsId_; - result.beginTime_ = beginTime_; + result.hcoin_ = hcoin_; + result.mcoin_ = mcoin_; + result.scoin_ = scoin_; + result.buyLimit_ = buyLimit_; + result.minLevel_ = minLevel_; result.nextRefreshTime_ = nextRefreshTime_; result.disableType_ = disableType_; - result.mcoin_ = mcoin_; + result.maxLevel_ = maxLevel_; + result.discountId_ = discountId_; + result.discountBeginTime_ = discountBeginTime_; + result.discountEndTime_ = discountEndTime_; + result.singleLimit_ = singleLimit_; + result.secondarySheetId_ = secondarySheetId_; + result.eHIAIOONFDH_ = eHIAIOONFDH_; if (goodsItemBuilder_ == null) { result.goodsItem_ = goodsItem_; } else { result.goodsItem_ = goodsItemBuilder_.build(); } - result.buyLimit_ = buyLimit_; - result.hcoin_ = hcoin_; - result.iBCGFFJGCID_ = iBCGFFJGCID_; - result.scoin_ = scoin_; - result.minLevel_ = minLevel_; if (costItemListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { costItemList_ = java.util.Collections.unmodifiableList(costItemList_); @@ -1239,13 +1292,8 @@ public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods buildPartial() { } result.preGoodsIdList_ = preGoodsIdList_; result.boughtNum_ = boughtNum_; + result.beginTime_ = beginTime_; result.endTime_ = endTime_; - result.maxLevel_ = maxLevel_; - result.bHNAJCLPOJE_ = bHNAJCLPOJE_; - result.kJAGOOHCNON_ = kJAGOOHCNON_; - result.aFOGAPGJCOH_ = aFOGAPGJCOH_; - result.eHIAIOONFDH_ = eHIAIOONFDH_; - result.mNCAAIMGCJJ_ = mNCAAIMGCJJ_; onBuilt(); return result; } @@ -1297,8 +1345,20 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods if (other.getGoodsId() != 0) { setGoodsId(other.getGoodsId()); } - if (other.getBeginTime() != 0) { - setBeginTime(other.getBeginTime()); + if (other.getHcoin() != 0) { + setHcoin(other.getHcoin()); + } + if (other.getMcoin() != 0) { + setMcoin(other.getMcoin()); + } + if (other.getScoin() != 0) { + setScoin(other.getScoin()); + } + if (other.getBuyLimit() != 0) { + setBuyLimit(other.getBuyLimit()); + } + if (other.getMinLevel() != 0) { + setMinLevel(other.getMinLevel()); } if (other.getNextRefreshTime() != 0) { setNextRefreshTime(other.getNextRefreshTime()); @@ -1306,26 +1366,29 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods if (other.getDisableType() != 0) { setDisableType(other.getDisableType()); } - if (other.getMcoin() != 0) { - setMcoin(other.getMcoin()); + if (other.getMaxLevel() != 0) { + setMaxLevel(other.getMaxLevel()); } - if (other.hasGoodsItem()) { - mergeGoodsItem(other.getGoodsItem()); + if (other.getDiscountId() != 0) { + setDiscountId(other.getDiscountId()); } - if (other.getBuyLimit() != 0) { - setBuyLimit(other.getBuyLimit()); + if (other.getDiscountBeginTime() != 0) { + setDiscountBeginTime(other.getDiscountBeginTime()); } - if (other.getHcoin() != 0) { - setHcoin(other.getHcoin()); + if (other.getDiscountEndTime() != 0) { + setDiscountEndTime(other.getDiscountEndTime()); } - if (other.getIBCGFFJGCID() != 0) { - setIBCGFFJGCID(other.getIBCGFFJGCID()); + if (other.getSingleLimit() != 0) { + setSingleLimit(other.getSingleLimit()); } - if (other.getScoin() != 0) { - setScoin(other.getScoin()); + if (other.getSecondarySheetId() != 0) { + setSecondarySheetId(other.getSecondarySheetId()); } - if (other.getMinLevel() != 0) { - setMinLevel(other.getMinLevel()); + if (other.getEHIAIOONFDH() != false) { + setEHIAIOONFDH(other.getEHIAIOONFDH()); + } + if (other.hasGoodsItem()) { + mergeGoodsItem(other.getGoodsItem()); } if (costItemListBuilder_ == null) { if (!other.costItemList_.isEmpty()) { @@ -1366,27 +1429,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods if (other.getBoughtNum() != 0) { setBoughtNum(other.getBoughtNum()); } + if (other.getBeginTime() != 0) { + setBeginTime(other.getBeginTime()); + } if (other.getEndTime() != 0) { setEndTime(other.getEndTime()); } - if (other.getMaxLevel() != 0) { - setMaxLevel(other.getMaxLevel()); - } - if (other.getBHNAJCLPOJE() != 0) { - setBHNAJCLPOJE(other.getBHNAJCLPOJE()); - } - if (other.getKJAGOOHCNON() != 0) { - setKJAGOOHCNON(other.getKJAGOOHCNON()); - } - if (other.getAFOGAPGJCOH() != 0) { - setAFOGAPGJCOH(other.getAFOGAPGJCOH()); - } - if (other.getEHIAIOONFDH() != false) { - setEHIAIOONFDH(other.getEHIAIOONFDH()); - } - if (other.getMNCAAIMGCJJ() != 0) { - setMNCAAIMGCJJ(other.getMNCAAIMGCJJ()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1419,6 +1467,10 @@ public Builder mergeFrom( private int goodsId_ ; /** + * 
+       * 5.0 update 可能不一定对
+       *
+ * * uint32 goods_id = 1; * @return The goodsId. */ @@ -1427,6 +1479,10 @@ public int getGoodsId() { return goodsId_; } /** + * 
+       * 5.0 update 可能不一定对
+       *
+ * * uint32 goods_id = 1; * @param value The goodsId to set. * @return This builder for chaining. @@ -1438,6 +1494,10 @@ public Builder setGoodsId(int value) { return this; } /** + * 
+       * 5.0 update 可能不一定对
+       *
+ * * uint32 goods_id = 1; * @return This builder for chaining. */ @@ -1448,33 +1508,205 @@ public Builder clearGoodsId() { return this; } - private int beginTime_ ; + private int hcoin_ ; /** - * uint32 begin_time = 2; - * @return The beginTime. + * 
+       * 原石 确定是对的
+       *
+ * + * uint32 hcoin = 8; + * @return The hcoin. */ @java.lang.Override - public int getBeginTime() { - return beginTime_; + public int getHcoin() { + return hcoin_; } /** - * uint32 begin_time = 2; - * @param value The beginTime to set. + * 
+       * 原石 确定是对的
+       *
+ * + * uint32 hcoin = 8; + * @param value The hcoin to set. * @return This builder for chaining. */ - public Builder setBeginTime(int value) { + public Builder setHcoin(int value) { - beginTime_ = value; + hcoin_ = value; onChanged(); return this; } /** - * uint32 begin_time = 2; + * 
+       * 原石 确定是对的
+       *
+ * + * uint32 hcoin = 8; * @return This builder for chaining. */ - public Builder clearBeginTime() { + public Builder clearHcoin() { - beginTime_ = 0; + hcoin_ = 0; + onChanged(); + return this; + } + + private int mcoin_ ; + /** + * 
+       * 结晶?  可能不对
+       *
+ * + * uint32 mcoin = 5; + * @return The mcoin. + */ + @java.lang.Override + public int getMcoin() { + return mcoin_; + } + /** + * 
+       * 结晶?  可能不对
+       *
+ * + * uint32 mcoin = 5; + * @param value The mcoin to set. + * @return This builder for chaining. + */ + public Builder setMcoin(int value) { + + mcoin_ = value; + onChanged(); + return this; + } + /** + * 
+       * 结晶?  可能不对
+       *
+ * + * uint32 mcoin = 5; + * @return This builder for chaining. + */ + public Builder clearMcoin() { + + mcoin_ = 0; + onChanged(); + return this; + } + + private int scoin_ ; + /** + * 
+       * 摩拉? 可能不对
+       *
+ * + * uint32 scoin = 10; + * @return The scoin. + */ + @java.lang.Override + public int getScoin() { + return scoin_; + } + /** + * 
+       * 摩拉? 可能不对
+       *
+ * + * uint32 scoin = 10; + * @param value The scoin to set. + * @return This builder for chaining. + */ + public Builder setScoin(int value) { + + scoin_ = value; + onChanged(); + return this; + } + /** + * 
+       * 摩拉? 可能不对
+       *
+ * + * uint32 scoin = 10; + * @return This builder for chaining. + */ + public Builder clearScoin() { + + scoin_ = 0; + onChanged(); + return this; + } + + private int buyLimit_ ; + /** + * 
+       * 虚假的值 
+       *
+ * + * uint32 buy_limit = 7; + * @return The buyLimit. + */ + @java.lang.Override + public int getBuyLimit() { + return buyLimit_; + } + /** + * 
+       * 虚假的值 
+       *
+ * + * uint32 buy_limit = 7; + * @param value The buyLimit to set. + * @return This builder for chaining. + */ + public Builder setBuyLimit(int value) { + + buyLimit_ = value; + onChanged(); + return this; + } + /** + * 
+       * 虚假的值 
+       *
+ * + * uint32 buy_limit = 7; + * @return This builder for chaining. + */ + public Builder clearBuyLimit() { + + buyLimit_ = 0; + onChanged(); + return this; + } + + private int minLevel_ ; + /** + * uint32 min_level = 11; + * @return The minLevel. + */ + @java.lang.Override + public int getMinLevel() { + return minLevel_; + } + /** + * uint32 min_level = 11; + * @param value The minLevel to set. + * @return This builder for chaining. + */ + public Builder setMinLevel(int value) { + + minLevel_ = value; + onChanged(); + return this; + } + /** + * uint32 min_level = 11; + * @return This builder for chaining. + */ + public Builder clearMinLevel() { + + minLevel_ = 0; onChanged(); return this; } @@ -1541,309 +1773,352 @@ public Builder clearDisableType() { return this; } - private int mcoin_ ; + private int maxLevel_ ; /** - * uint32 mcoin = 5; - * @return The mcoin. + * uint32 max_level = 590; + * @return The maxLevel. */ @java.lang.Override - public int getMcoin() { - return mcoin_; + public int getMaxLevel() { + return maxLevel_; } /** - * uint32 mcoin = 5; - * @param value The mcoin to set. + * uint32 max_level = 590; + * @param value The maxLevel to set. * @return This builder for chaining. */ - public Builder setMcoin(int value) { + public Builder setMaxLevel(int value) { - mcoin_ = value; + maxLevel_ = value; onChanged(); return this; } /** - * uint32 mcoin = 5; + * uint32 max_level = 590; * @return This builder for chaining. */ - public Builder clearMcoin() { + public Builder clearMaxLevel() { - mcoin_ = 0; + maxLevel_ = 0; onChanged(); return this; } - private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam goodsItem_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> goodsItemBuilder_; + private int discountId_ ; /** - * .ItemParam goods_item = 6; - * @return Whether the goodsItem field is set. + * uint32 discount_id = 106; + * @return The discountId. */ - public boolean hasGoodsItem() { - return goodsItemBuilder_ != null || goodsItem_ != null; + @java.lang.Override + public int getDiscountId() { + return discountId_; } /** - * .ItemParam goods_item = 6; - * @return The goodsItem. + * uint32 discount_id = 106; + * @param value The discountId to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem() { - if (goodsItemBuilder_ == null) { - return goodsItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_; - } else { - return goodsItemBuilder_.getMessage(); - } + public Builder setDiscountId(int value) { + + discountId_ = value; + onChanged(); + return this; } /** - * .ItemParam goods_item = 6; + * uint32 discount_id = 106; + * @return This builder for chaining. */ - public Builder setGoodsItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (goodsItemBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - goodsItem_ = value; - onChanged(); - } else { - goodsItemBuilder_.setMessage(value); - } - + public Builder clearDiscountId() { + + discountId_ = 0; + onChanged(); return this; } + + private int discountBeginTime_ ; /** - * .ItemParam goods_item = 6; + * uint32 discount_begin_time = 107; + * @return The discountBeginTime. */ - public Builder setGoodsItem( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (goodsItemBuilder_ == null) { - goodsItem_ = builderForValue.build(); - onChanged(); - } else { - goodsItemBuilder_.setMessage(builderForValue.build()); - } - - return this; + @java.lang.Override + public int getDiscountBeginTime() { + return discountBeginTime_; } /** - * .ItemParam goods_item = 6; + * uint32 discount_begin_time = 107; + * @param value The discountBeginTime to set. + * @return This builder for chaining. */ - public Builder mergeGoodsItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (goodsItemBuilder_ == null) { - if (goodsItem_ != null) { - goodsItem_ = - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.newBuilder(goodsItem_).mergeFrom(value).buildPartial(); - } else { - goodsItem_ = value; - } - onChanged(); - } else { - goodsItemBuilder_.mergeFrom(value); - } - + public Builder setDiscountBeginTime(int value) { + + discountBeginTime_ = value; + onChanged(); return this; } /** - * .ItemParam goods_item = 6; + * uint32 discount_begin_time = 107; + * @return This builder for chaining. */ - public Builder clearGoodsItem() { - if (goodsItemBuilder_ == null) { - goodsItem_ = null; - onChanged(); - } else { - goodsItem_ = null; - goodsItemBuilder_ = null; - } - + public Builder clearDiscountBeginTime() { + + discountBeginTime_ = 0; + onChanged(); return this; } + + private int discountEndTime_ ; /** - * .ItemParam goods_item = 6; + * uint32 discount_end_time = 108; + * @return The discountEndTime. */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getGoodsItemBuilder() { - - onChanged(); - return getGoodsItemFieldBuilder().getBuilder(); + @java.lang.Override + public int getDiscountEndTime() { + return discountEndTime_; } /** - * .ItemParam goods_item = 6; + * uint32 discount_end_time = 108; + * @param value The discountEndTime to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder() { - if (goodsItemBuilder_ != null) { - return goodsItemBuilder_.getMessageOrBuilder(); - } else { - return goodsItem_ == null ? - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_; - } + public Builder setDiscountEndTime(int value) { + + discountEndTime_ = value; + onChanged(); + return this; } /** - * .ItemParam goods_item = 6; + * uint32 discount_end_time = 108; + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> - getGoodsItemFieldBuilder() { - if (goodsItemBuilder_ == null) { - goodsItemBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( - getGoodsItem(), - getParentForChildren(), - isClean()); - goodsItem_ = null; - } - return goodsItemBuilder_; + public Builder clearDiscountEndTime() { + + discountEndTime_ = 0; + onChanged(); + return this; } - private int buyLimit_ ; + private int singleLimit_ ; /** - * uint32 buy_limit = 7; - * @return The buyLimit. + * uint32 single_limit = 109; + * @return The singleLimit. */ @java.lang.Override - public int getBuyLimit() { - return buyLimit_; + public int getSingleLimit() { + return singleLimit_; } /** - * uint32 buy_limit = 7; - * @param value The buyLimit to set. + * uint32 single_limit = 109; + * @param value The singleLimit to set. * @return This builder for chaining. */ - public Builder setBuyLimit(int value) { + public Builder setSingleLimit(int value) { - buyLimit_ = value; + singleLimit_ = value; onChanged(); return this; } /** - * uint32 buy_limit = 7; + * uint32 single_limit = 109; * @return This builder for chaining. */ - public Builder clearBuyLimit() { + public Builder clearSingleLimit() { - buyLimit_ = 0; + singleLimit_ = 0; onChanged(); return this; } - private int hcoin_ ; + private int secondarySheetId_ ; /** - * uint32 hcoin = 8; - * @return The hcoin. + * uint32 secondary_sheet_id = 110; + * @return The secondarySheetId. */ @java.lang.Override - public int getHcoin() { - return hcoin_; + public int getSecondarySheetId() { + return secondarySheetId_; } /** - * uint32 hcoin = 8; - * @param value The hcoin to set. + * uint32 secondary_sheet_id = 110; + * @param value The secondarySheetId to set. * @return This builder for chaining. */ - public Builder setHcoin(int value) { + public Builder setSecondarySheetId(int value) { - hcoin_ = value; + secondarySheetId_ = value; onChanged(); return this; } /** - * uint32 hcoin = 8; + * uint32 secondary_sheet_id = 110; * @return This builder for chaining. */ - public Builder clearHcoin() { + public Builder clearSecondarySheetId() { - hcoin_ = 0; + secondarySheetId_ = 0; onChanged(); return this; } - private int iBCGFFJGCID_ ; + private boolean eHIAIOONFDH_ ; /** - * uint32 IBCGFFJGCID = 9; - * @return The iBCGFFJGCID. + * 
+       * 大概率对的 
+       *
+ * + * bool EHIAIOONFDH = 1748; + * @return The eHIAIOONFDH. */ @java.lang.Override - public int getIBCGFFJGCID() { - return iBCGFFJGCID_; + public boolean getEHIAIOONFDH() { + return eHIAIOONFDH_; + } + /** + * 
+       * 大概率对的 
+       *
+ * + * bool EHIAIOONFDH = 1748; + * @param value The eHIAIOONFDH to set. + * @return This builder for chaining. + */ + public Builder setEHIAIOONFDH(boolean value) { + + eHIAIOONFDH_ = value; + onChanged(); + return this; } /** - * uint32 IBCGFFJGCID = 9; - * @param value The iBCGFFJGCID to set. + * 
+       * 大概率对的 
+       *
+ * + * bool EHIAIOONFDH = 1748; * @return This builder for chaining. */ - public Builder setIBCGFFJGCID(int value) { + public Builder clearEHIAIOONFDH() { - iBCGFFJGCID_ = value; + eHIAIOONFDH_ = false; onChanged(); return this; } + + private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam goodsItem_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> goodsItemBuilder_; + /** + * .ItemParam goods_item = 6; + * @return Whether the goodsItem field is set. + */ + public boolean hasGoodsItem() { + return goodsItemBuilder_ != null || goodsItem_ != null; + } + /** + * .ItemParam goods_item = 6; + * @return The goodsItem. + */ + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem() { + if (goodsItemBuilder_ == null) { + return goodsItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_; + } else { + return goodsItemBuilder_.getMessage(); + } + } + /** + * .ItemParam goods_item = 6; + */ + public Builder setGoodsItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (goodsItemBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + goodsItem_ = value; + onChanged(); + } else { + goodsItemBuilder_.setMessage(value); + } + + return this; + } + /** + * .ItemParam goods_item = 6; + */ + public Builder setGoodsItem( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (goodsItemBuilder_ == null) { + goodsItem_ = builderForValue.build(); + onChanged(); + } else { + goodsItemBuilder_.setMessage(builderForValue.build()); + } + + return this; + } /** - * uint32 IBCGFFJGCID = 9; - * @return This builder for chaining. + * .ItemParam goods_item = 6; */ - public Builder clearIBCGFFJGCID() { - - iBCGFFJGCID_ = 0; - onChanged(); - return this; - } + public Builder mergeGoodsItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (goodsItemBuilder_ == null) { + if (goodsItem_ != null) { + goodsItem_ = + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.newBuilder(goodsItem_).mergeFrom(value).buildPartial(); + } else { + goodsItem_ = value; + } + onChanged(); + } else { + goodsItemBuilder_.mergeFrom(value); + } - private int scoin_ ; - /** - * uint32 scoin = 10; - * @return The scoin. - */ - @java.lang.Override - public int getScoin() { - return scoin_; + return this; } /** - * uint32 scoin = 10; - * @param value The scoin to set. - * @return This builder for chaining. + * .ItemParam goods_item = 6; */ - public Builder setScoin(int value) { - - scoin_ = value; - onChanged(); + public Builder clearGoodsItem() { + if (goodsItemBuilder_ == null) { + goodsItem_ = null; + onChanged(); + } else { + goodsItem_ = null; + goodsItemBuilder_ = null; + } + return this; } /** - * uint32 scoin = 10; - * @return This builder for chaining. + * .ItemParam goods_item = 6; */ - public Builder clearScoin() { + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getGoodsItemBuilder() { - scoin_ = 0; onChanged(); - return this; - } - - private int minLevel_ ; - /** - * uint32 min_level = 11; - * @return The minLevel. - */ - @java.lang.Override - public int getMinLevel() { - return minLevel_; + return getGoodsItemFieldBuilder().getBuilder(); } /** - * uint32 min_level = 11; - * @param value The minLevel to set. - * @return This builder for chaining. + * .ItemParam goods_item = 6; */ - public Builder setMinLevel(int value) { - - minLevel_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder() { + if (goodsItemBuilder_ != null) { + return goodsItemBuilder_.getMessageOrBuilder(); + } else { + return goodsItem_ == null ? + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_; + } } /** - * uint32 min_level = 11; - * @return This builder for chaining. + * .ItemParam goods_item = 6; */ - public Builder clearMinLevel() { - - minLevel_ = 0; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> + getGoodsItemFieldBuilder() { + if (goodsItemBuilder_ == null) { + goodsItemBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( + getGoodsItem(), + getParentForChildren(), + isClean()); + goodsItem_ = null; + } + return goodsItemBuilder_; } private java.util.List costItemList_ = @@ -2196,219 +2471,64 @@ public Builder clearBoughtNum() { return this; } - private int endTime_ ; - /** - * uint32 end_time = 15; - * @return The endTime. - */ - @java.lang.Override - public int getEndTime() { - return endTime_; - } - /** - * uint32 end_time = 15; - * @param value The endTime to set. - * @return This builder for chaining. - */ - public Builder setEndTime(int value) { - - endTime_ = value; - onChanged(); - return this; - } - /** - * uint32 end_time = 15; - * @return This builder for chaining. - */ - public Builder clearEndTime() { - - endTime_ = 0; - onChanged(); - return this; - } - - private int maxLevel_ ; - /** - * uint32 max_level = 590; - * @return The maxLevel. - */ - @java.lang.Override - public int getMaxLevel() { - return maxLevel_; - } - /** - * uint32 max_level = 590; - * @param value The maxLevel to set. - * @return This builder for chaining. - */ - public Builder setMaxLevel(int value) { - - maxLevel_ = value; - onChanged(); - return this; - } - /** - * uint32 max_level = 590; - * @return This builder for chaining. - */ - public Builder clearMaxLevel() { - - maxLevel_ = 0; - onChanged(); - return this; - } - - private int bHNAJCLPOJE_ ; - /** - * uint32 BHNAJCLPOJE = 1487; - * @return The bHNAJCLPOJE. - */ - @java.lang.Override - public int getBHNAJCLPOJE() { - return bHNAJCLPOJE_; - } - /** - * uint32 BHNAJCLPOJE = 1487; - * @param value The bHNAJCLPOJE to set. - * @return This builder for chaining. - */ - public Builder setBHNAJCLPOJE(int value) { - - bHNAJCLPOJE_ = value; - onChanged(); - return this; - } - /** - * uint32 BHNAJCLPOJE = 1487; - * @return This builder for chaining. - */ - public Builder clearBHNAJCLPOJE() { - - bHNAJCLPOJE_ = 0; - onChanged(); - return this; - } - - private int kJAGOOHCNON_ ; - /** - * uint32 KJAGOOHCNON = 1541; - * @return The kJAGOOHCNON. - */ - @java.lang.Override - public int getKJAGOOHCNON() { - return kJAGOOHCNON_; - } - /** - * uint32 KJAGOOHCNON = 1541; - * @param value The kJAGOOHCNON to set. - * @return This builder for chaining. - */ - public Builder setKJAGOOHCNON(int value) { - - kJAGOOHCNON_ = value; - onChanged(); - return this; - } - /** - * uint32 KJAGOOHCNON = 1541; - * @return This builder for chaining. - */ - public Builder clearKJAGOOHCNON() { - - kJAGOOHCNON_ = 0; - onChanged(); - return this; - } - - private int aFOGAPGJCOH_ ; - /** - * uint32 AFOGAPGJCOH = 1587; - * @return The aFOGAPGJCOH. - */ - @java.lang.Override - public int getAFOGAPGJCOH() { - return aFOGAPGJCOH_; - } - /** - * uint32 AFOGAPGJCOH = 1587; - * @param value The aFOGAPGJCOH to set. - * @return This builder for chaining. - */ - public Builder setAFOGAPGJCOH(int value) { - - aFOGAPGJCOH_ = value; - onChanged(); - return this; - } - /** - * uint32 AFOGAPGJCOH = 1587; - * @return This builder for chaining. - */ - public Builder clearAFOGAPGJCOH() { - - aFOGAPGJCOH_ = 0; - onChanged(); - return this; - } - - private boolean eHIAIOONFDH_ ; + private int beginTime_ ; /** - * bool EHIAIOONFDH = 1748; - * @return The eHIAIOONFDH. + * uint32 begin_time = 2; + * @return The beginTime. */ @java.lang.Override - public boolean getEHIAIOONFDH() { - return eHIAIOONFDH_; + public int getBeginTime() { + return beginTime_; } /** - * bool EHIAIOONFDH = 1748; - * @param value The eHIAIOONFDH to set. + * uint32 begin_time = 2; + * @param value The beginTime to set. * @return This builder for chaining. */ - public Builder setEHIAIOONFDH(boolean value) { + public Builder setBeginTime(int value) { - eHIAIOONFDH_ = value; + beginTime_ = value; onChanged(); return this; } /** - * bool EHIAIOONFDH = 1748; + * uint32 begin_time = 2; * @return This builder for chaining. */ - public Builder clearEHIAIOONFDH() { + public Builder clearBeginTime() { - eHIAIOONFDH_ = false; + beginTime_ = 0; onChanged(); return this; } - private int mNCAAIMGCJJ_ ; + private int endTime_ ; /** - * uint32 MNCAAIMGCJJ = 1942; - * @return The mNCAAIMGCJJ. + * uint32 end_time = 15; + * @return The endTime. */ @java.lang.Override - public int getMNCAAIMGCJJ() { - return mNCAAIMGCJJ_; + public int getEndTime() { + return endTime_; } /** - * uint32 MNCAAIMGCJJ = 1942; - * @param value The mNCAAIMGCJJ to set. + * uint32 end_time = 15; + * @param value The endTime to set. * @return This builder for chaining. */ - public Builder setMNCAAIMGCJJ(int value) { + public Builder setEndTime(int value) { - mNCAAIMGCJJ_ = value; + endTime_ = value; onChanged(); return this; } /** - * uint32 MNCAAIMGCJJ = 1942; + * uint32 end_time = 15; * @return This builder for chaining. */ - public Builder clearMNCAAIMGCJJ() { + public Builder clearEndTime() { - mNCAAIMGCJJ_ = 0; + endTime_ = 0; onChanged(); return this; } @@ -2479,20 +2599,20 @@ public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getDefaultInstanc descriptor; static { java.lang.String[] descriptorData = { - "\n\017ShopGoods.proto\032\017ItemParam.proto\"\321\003\n\tS" + - "hopGoods\022\020\n\010goods_id\030\001 \001(\r\022\022\n\nbegin_time" + - "\030\002 \001(\r\022\031\n\021next_refresh_time\030\003 \001(\r\022\024\n\014dis" + - "able_type\030\004 \001(\r\022\r\n\005mcoin\030\005 \001(\r\022\036\n\ngoods_" + - "item\030\006 \001(\0132\n.ItemParam\022\021\n\tbuy_limit\030\007 \001(" + - "\r\022\r\n\005hcoin\030\010 \001(\r\022\023\n\013IBCGFFJGCID\030\t \001(\r\022\r\n" + - "\005scoin\030\n \001(\r\022\021\n\tmin_level\030\013 \001(\r\022\"\n\016cost_" + - "item_list\030\014 \003(\0132\n.ItemParam\022\031\n\021pre_goods" + - "_id_list\030\r \003(\r\022\022\n\nbought_num\030\016 \001(\r\022\020\n\010en" + - "d_time\030\017 \001(\r\022\022\n\tmax_level\030\316\004 \001(\r\022\024\n\013BHNA" + - "JCLPOJE\030\317\013 \001(\r\022\024\n\013KJAGOOHCNON\030\205\014 \001(\r\022\024\n\013" + - "AFOGAPGJCOH\030\263\014 \001(\r\022\024\n\013EHIAIOONFDH\030\324\r \001(\010" + - "\022\024\n\013MNCAAIMGCJJ\030\226\017 \001(\rB\033\n\031emu.grasscutte" + - "r.net.protob\006proto3" + "\n\017ShopGoods.proto\032\017ItemParam.proto\"\343\003\n\tS" + + "hopGoods\022\020\n\010goods_id\030\001 \001(\r\022\r\n\005hcoin\030\010 \001(" + + "\r\022\r\n\005mcoin\030\005 \001(\r\022\r\n\005scoin\030\n \001(\r\022\021\n\tbuy_l" + + "imit\030\007 \001(\r\022\021\n\tmin_level\030\013 \001(\r\022\031\n\021next_re" + + "fresh_time\030\003 \001(\r\022\024\n\014disable_type\030\004 \001(\r\022\022" + + "\n\tmax_level\030\316\004 \001(\r\022\023\n\013discount_id\030j \001(\r\022" + + "\033\n\023discount_begin_time\030k \001(\r\022\031\n\021discount" + + "_end_time\030l \001(\r\022\024\n\014single_limit\030m \001(\r\022\032\n" + + "\022secondary_sheet_id\030n \001(\r\022\024\n\013EHIAIOONFDH" + + "\030\324\r \001(\010\022\036\n\ngoods_item\030\006 \001(\0132\n.ItemParam\022" + + "\"\n\016cost_item_list\030\014 \003(\0132\n.ItemParam\022\031\n\021p" + + "re_goods_id_list\030\r \003(\r\022\022\n\nbought_num\030\016 \001" + + "(\r\022\022\n\nbegin_time\030\002 \001(\r\022\020\n\010end_time\030\017 \001(\r" + + "B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -2504,7 +2624,7 @@ public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getDefaultInstanc internal_static_ShopGoods_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ShopGoods_descriptor, - new java.lang.String[] { "GoodsId", "BeginTime", "NextRefreshTime", "DisableType", "Mcoin", "GoodsItem", "BuyLimit", "Hcoin", "IBCGFFJGCID", "Scoin", "MinLevel", "CostItemList", "PreGoodsIdList", "BoughtNum", "EndTime", "MaxLevel", "BHNAJCLPOJE", "KJAGOOHCNON", "AFOGAPGJCOH", "EHIAIOONFDH", "MNCAAIMGCJJ", }); + new java.lang.String[] { "GoodsId", "Hcoin", "Mcoin", "Scoin", "BuyLimit", "MinLevel", "NextRefreshTime", "DisableType", "MaxLevel", "DiscountId", "DiscountBeginTime", "DiscountEndTime", "SingleLimit", "SecondarySheetId", "EHIAIOONFDH", "GoodsItem", "CostItemList", "PreGoodsIdList", "BoughtNum", "BeginTime", "EndTime", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShowCommonTipsNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShowCommonTipsNotifyOuterClass.java index c17e58285eb..9d6fb6df024 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ShowCommonTipsNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ShowCommonTipsNotifyOuterClass.java @@ -19,23 +19,17 @@ public interface ShowCommonTipsNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * string title = 13; + * string title = 1; * @return The title. */ java.lang.String getTitle(); /** - * string title = 13; + * string title = 1; * @return The bytes for title. */ com.google.protobuf.ByteString getTitleBytes(); - /** - * uint32 close_time = 1; - * @return The closeTime. - */ - int getCloseTime(); - /** * string content = 7; * @return The content. @@ -47,11 +41,17 @@ public interface ShowCommonTipsNotifyOrBuilder extends */ com.google.protobuf.ByteString getContentBytes(); + + /** + * uint32 close_time = 12; + * @return The closeTime. + */ + int getCloseTime(); } /** * 
-   * CmdId: 28414
-   * Obf: APCMNECPKCJ
+   * CmdId: 20003
+   * obf: PFEJCMICHNA
    *
* * Protobuf type {@code ShowCommonTipsNotify} @@ -100,9 +100,10 @@ private ShowCommonTipsNotify( case 0: done = true; break; - case 8: { + case 10: { + java.lang.String s = input.readStringRequireUtf8(); - closeTime_ = input.readUInt32(); + title_ = s; break; } case 58: { @@ -111,10 +112,9 @@ private ShowCommonTipsNotify( content_ = s; break; } - case 106: { - java.lang.String s = input.readStringRequireUtf8(); + case 96: { - title_ = s; + closeTime_ = input.readUInt32(); break; } default: { @@ -149,10 +149,10 @@ private ShowCommonTipsNotify( emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNotify.class, emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNotify.Builder.class); } - public static final int TITLE_FIELD_NUMBER = 13; + public static final int TITLE_FIELD_NUMBER = 1; private volatile java.lang.Object title_; /** - * string title = 13; + * string title = 1; * @return The title. */ @java.lang.Override @@ -169,7 +169,7 @@ public java.lang.String getTitle() { } } /** - * string title = 13; + * string title = 1; * @return The bytes for title. */ @java.lang.Override @@ -187,17 +187,6 @@ public java.lang.String getTitle() { } } - public static final int CLOSE_TIME_FIELD_NUMBER = 1; - private int closeTime_; - /** - * uint32 close_time = 1; - * @return The closeTime. - */ - @java.lang.Override - public int getCloseTime() { - return closeTime_; - } - public static final int CONTENT_FIELD_NUMBER = 7; private volatile java.lang.Object content_; /** @@ -236,6 +225,17 @@ public java.lang.String getContent() { } } + public static final int CLOSE_TIME_FIELD_NUMBER = 12; + private int closeTime_; + /** + * uint32 close_time = 12; + * @return The closeTime. + */ + @java.lang.Override + public int getCloseTime() { + return closeTime_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -250,14 +250,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (closeTime_ != 0) { - output.writeUInt32(1, closeTime_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, title_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 7, content_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 13, title_); + if (closeTime_ != 0) { + output.writeUInt32(12, closeTime_); } unknownFields.writeTo(output); } @@ -268,15 +268,15 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (closeTime_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, closeTime_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, title_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, content_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, title_); + if (closeTime_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(12, closeTime_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -295,10 +295,10 @@ public boolean equals(final java.lang.Object obj) { if (!getTitle() .equals(other.getTitle())) return false; - if (getCloseTime() - != other.getCloseTime()) return false; if (!getContent() .equals(other.getContent())) return false; + if (getCloseTime() + != other.getCloseTime()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -312,10 +312,10 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + TITLE_FIELD_NUMBER; hash = (53 * hash) + getTitle().hashCode(); - hash = (37 * hash) + CLOSE_TIME_FIELD_NUMBER; - hash = (53 * hash) + getCloseTime(); hash = (37 * hash) + CONTENT_FIELD_NUMBER; hash = (53 * hash) + getContent().hashCode(); + hash = (37 * hash) + CLOSE_TIME_FIELD_NUMBER; + hash = (53 * hash) + getCloseTime(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -413,8 +413,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28414
-     * Obf: APCMNECPKCJ
+     * CmdId: 20003
+     * obf: PFEJCMICHNA
      *
* * Protobuf type {@code ShowCommonTipsNotify} @@ -456,10 +456,10 @@ public Builder clear() { super.clear(); title_ = ""; - closeTime_ = 0; - content_ = ""; + closeTime_ = 0; + return this; } @@ -487,8 +487,8 @@ public emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNo public emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNotify buildPartial() { emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNotify result = new emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNotify(this); result.title_ = title_; - result.closeTime_ = closeTime_; result.content_ = content_; + result.closeTime_ = closeTime_; onBuilt(); return result; } @@ -541,13 +541,13 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClas title_ = other.title_; onChanged(); } - if (other.getCloseTime() != 0) { - setCloseTime(other.getCloseTime()); - } if (!other.getContent().isEmpty()) { content_ = other.content_; onChanged(); } + if (other.getCloseTime() != 0) { + setCloseTime(other.getCloseTime()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -579,7 +579,7 @@ public Builder mergeFrom( private java.lang.Object title_ = ""; /** - * string title = 13; + * string title = 1; * @return The title. */ public java.lang.String getTitle() { @@ -595,7 +595,7 @@ public java.lang.String getTitle() { } } /** - * string title = 13; + * string title = 1; * @return The bytes for title. */ public com.google.protobuf.ByteString @@ -612,7 +612,7 @@ public java.lang.String getTitle() { } } /** - * string title = 13; + * string title = 1; * @param value The title to set. * @return This builder for chaining. */ @@ -627,7 +627,7 @@ public Builder setTitle( return this; } /** - * string title = 13; + * string title = 1; * @return This builder for chaining. */ public Builder clearTitle() { @@ -637,7 +637,7 @@ public Builder clearTitle() { return this; } /** - * string title = 13; + * string title = 1; * @param value The bytes for title to set. * @return This builder for chaining. */ @@ -653,37 +653,6 @@ public Builder setTitleBytes( return this; } - private int closeTime_ ; - /** - * uint32 close_time = 1; - * @return The closeTime. - */ - @java.lang.Override - public int getCloseTime() { - return closeTime_; - } - /** - * uint32 close_time = 1; - * @param value The closeTime to set. - * @return This builder for chaining. - */ - public Builder setCloseTime(int value) { - - closeTime_ = value; - onChanged(); - return this; - } - /** - * uint32 close_time = 1; - * @return This builder for chaining. - */ - public Builder clearCloseTime() { - - closeTime_ = 0; - onChanged(); - return this; - } - private java.lang.Object content_ = ""; /** * string content = 7; @@ -759,6 +728,37 @@ public Builder setContentBytes( onChanged(); return this; } + + private int closeTime_ ; + /** + * uint32 close_time = 12; + * @return The closeTime. + */ + @java.lang.Override + public int getCloseTime() { + return closeTime_; + } + /** + * uint32 close_time = 12; + * @param value The closeTime to set. + * @return This builder for chaining. + */ + public Builder setCloseTime(int value) { + + closeTime_ = value; + onChanged(); + return this; + } + /** + * uint32 close_time = 12; + * @return This builder for chaining. + */ + public Builder clearCloseTime() { + + closeTime_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -827,8 +827,8 @@ public emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNo static { java.lang.String[] descriptorData = { "\n\032ShowCommonTipsNotify.proto\"J\n\024ShowComm" + - "onTipsNotify\022\r\n\005title\030\r \001(\t\022\022\n\nclose_tim" + - "e\030\001 \001(\r\022\017\n\007content\030\007 \001(\tB\033\n\031emu.grasscut" + + "onTipsNotify\022\r\n\005title\030\001 \001(\t\022\017\n\007content\030\007" + + " \001(\t\022\022\n\nclose_time\030\014 \001(\rB\033\n\031emu.grasscut" + "ter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -840,7 +840,7 @@ public emu.grasscutter.net.proto.ShowCommonTipsNotifyOuterClass.ShowCommonTipsNo internal_static_ShowCommonTipsNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ShowCommonTipsNotify_descriptor, - new java.lang.String[] { "Title", "CloseTime", "Content", }); + new java.lang.String[] { "Title", "Content", "CloseTime", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShowMessageNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShowMessageNotifyOuterClass.java index da2eb38b57e..5306792190f 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/ShowMessageNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/ShowMessageNotifyOuterClass.java @@ -18,6 +18,17 @@ public interface ShowMessageNotifyOrBuilder extends // @@protoc_insertion_point(interface_extends:ShowMessageNotify) com.google.protobuf.MessageOrBuilder { + /** + * .SvrMsgId msg_id = 3; + * @return The enum numeric value on the wire for msgId. + */ + int getMsgIdValue(); + /** + * .SvrMsgId msg_id = 3; + * @return The msgId. + */ + emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId getMsgId(); + /** * repeated .MsgParam params = 6; */ @@ -41,22 +52,10 @@ public interface ShowMessageNotifyOrBuilder extends */ emu.grasscutter.net.proto.MsgParamOuterClass.MsgParamOrBuilder getParamsOrBuilder( int index); - - /** - * .SvrMsgId msg_id = 8; - * @return The enum numeric value on the wire for msgId. - */ - int getMsgIdValue(); - /** - * .SvrMsgId msg_id = 8; - * @return The msgId. - */ - emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId getMsgId(); } /** * 
-   * CmdId: 20664
-   * Obf: NEGGKKAEGNL
+   * CmdId: 4799
    *
* * Protobuf type {@code ShowMessageNotify} @@ -71,8 +70,8 @@ private ShowMessageNotify(com.google.protobuf.GeneratedMessageV3.Builder buil super(builder); } private ShowMessageNotify() { - params_ = java.util.Collections.emptyList(); msgId_ = 0; + params_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -106,6 +105,12 @@ private ShowMessageNotify( case 0: done = true; break; + case 24: { + int rawValue = input.readEnum(); + + msgId_ = rawValue; + break; + } case 50: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { params_ = new java.util.ArrayList(); @@ -115,12 +120,6 @@ private ShowMessageNotify( input.readMessage(emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam.parser(), extensionRegistry)); break; } - case 64: { - int rawValue = input.readEnum(); - - msgId_ = rawValue; - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -156,6 +155,25 @@ private ShowMessageNotify( emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify.class, emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify.Builder.class); } + public static final int MSG_ID_FIELD_NUMBER = 3; + private int msgId_; + /** + * .SvrMsgId msg_id = 3; + * @return The enum numeric value on the wire for msgId. + */ + @java.lang.Override public int getMsgIdValue() { + return msgId_; + } + /** + * .SvrMsgId msg_id = 3; + * @return The msgId. + */ + @java.lang.Override public emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId getMsgId() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId result = emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.valueOf(msgId_); + return result == null ? emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.UNRECOGNIZED : result; + } + public static final int PARAMS_FIELD_NUMBER = 6; private java.util.List params_; /** @@ -196,25 +214,6 @@ public emu.grasscutter.net.proto.MsgParamOuterClass.MsgParamOrBuilder getParamsO return params_.get(index); } - public static final int MSG_ID_FIELD_NUMBER = 8; - private int msgId_; - /** - * .SvrMsgId msg_id = 8; - * @return The enum numeric value on the wire for msgId. - */ - @java.lang.Override public int getMsgIdValue() { - return msgId_; - } - /** - * .SvrMsgId msg_id = 8; - * @return The msgId. - */ - @java.lang.Override public emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId getMsgId() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId result = emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.valueOf(msgId_); - return result == null ? emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.UNRECOGNIZED : result; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -229,12 +228,12 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (msgId_ != emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.MSG_UNKNOWN.getNumber()) { + output.writeEnum(3, msgId_); + } for (int i = 0; i < params_.size(); i++) { output.writeMessage(6, params_.get(i)); } - if (msgId_ != emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.MSG_UNKNOWN.getNumber()) { - output.writeEnum(8, msgId_); - } unknownFields.writeTo(output); } @@ -244,13 +243,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < params_.size(); i++) { + if (msgId_ != emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.MSG_UNKNOWN.getNumber()) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, params_.get(i)); + .computeEnumSize(3, msgId_); } - if (msgId_ != emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.MSG_UNKNOWN.getNumber()) { + for (int i = 0; i < params_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(8, msgId_); + .computeMessageSize(6, params_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -267,9 +266,9 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify other = (emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify) obj; + if (msgId_ != other.msgId_) return false; if (!getParamsList() .equals(other.getParamsList())) return false; - if (msgId_ != other.msgId_) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -281,12 +280,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MSG_ID_FIELD_NUMBER; + hash = (53 * hash) + msgId_; if (getParamsCount() > 0) { hash = (37 * hash) + PARAMS_FIELD_NUMBER; hash = (53 * hash) + getParamsList().hashCode(); } - hash = (37 * hash) + MSG_ID_FIELD_NUMBER; - hash = (53 * hash) + msgId_; hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -384,8 +383,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20664
-     * Obf: NEGGKKAEGNL
+     * CmdId: 4799
      *
* * Protobuf type {@code ShowMessageNotify} @@ -426,14 +424,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + msgId_ = 0; + if (paramsBuilder_ == null) { params_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { paramsBuilder_.clear(); } - msgId_ = 0; - return this; } @@ -461,6 +459,7 @@ public emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify b public emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify buildPartial() { emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify result = new emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify(this); int from_bitField0_ = bitField0_; + result.msgId_ = msgId_; if (paramsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { params_ = java.util.Collections.unmodifiableList(params_); @@ -470,7 +469,6 @@ public emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify b } else { result.params_ = paramsBuilder_.build(); } - result.msgId_ = msgId_; onBuilt(); return result; } @@ -519,6 +517,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify other) { if (other == emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify.getDefaultInstance()) return this; + if (other.msgId_ != 0) { + setMsgIdValue(other.getMsgIdValue()); + } if (paramsBuilder_ == null) { if (!other.params_.isEmpty()) { if (params_.isEmpty()) { @@ -545,9 +546,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.S } } } - if (other.msgId_ != 0) { - setMsgIdValue(other.getMsgIdValue()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -578,6 +576,60 @@ public Builder mergeFrom( } private int bitField0_; + private int msgId_ = 0; + /** + * .SvrMsgId msg_id = 3; + * @return The enum numeric value on the wire for msgId. + */ + @java.lang.Override public int getMsgIdValue() { + return msgId_; + } + /** + * .SvrMsgId msg_id = 3; + * @param value The enum numeric value on the wire for msgId to set. + * @return This builder for chaining. + */ + public Builder setMsgIdValue(int value) { + + msgId_ = value; + onChanged(); + return this; + } + /** + * .SvrMsgId msg_id = 3; + * @return The msgId. + */ + @java.lang.Override + public emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId getMsgId() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId result = emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.valueOf(msgId_); + return result == null ? emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.UNRECOGNIZED : result; + } + /** + * .SvrMsgId msg_id = 3; + * @param value The msgId to set. + * @return This builder for chaining. + */ + public Builder setMsgId(emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId value) { + if (value == null) { + throw new NullPointerException(); + } + + msgId_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .SvrMsgId msg_id = 3; + * @return This builder for chaining. + */ + public Builder clearMsgId() { + + msgId_ = 0; + onChanged(); + return this; + } + private java.util.List params_ = java.util.Collections.emptyList(); private void ensureParamsIsMutable() { @@ -817,60 +869,6 @@ public emu.grasscutter.net.proto.MsgParamOuterClass.MsgParam.Builder addParamsBu } return paramsBuilder_; } - - private int msgId_ = 0; - /** - * .SvrMsgId msg_id = 8; - * @return The enum numeric value on the wire for msgId. - */ - @java.lang.Override public int getMsgIdValue() { - return msgId_; - } - /** - * .SvrMsgId msg_id = 8; - * @param value The enum numeric value on the wire for msgId to set. - * @return This builder for chaining. - */ - public Builder setMsgIdValue(int value) { - - msgId_ = value; - onChanged(); - return this; - } - /** - * .SvrMsgId msg_id = 8; - * @return The msgId. - */ - @java.lang.Override - public emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId getMsgId() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId result = emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.valueOf(msgId_); - return result == null ? emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId.UNRECOGNIZED : result; - } - /** - * .SvrMsgId msg_id = 8; - * @param value The msgId to set. - * @return This builder for chaining. - */ - public Builder setMsgId(emu.grasscutter.net.proto.SvrMsgIdOuterClass.SvrMsgId value) { - if (value == null) { - throw new NullPointerException(); - } - - msgId_ = value.getNumber(); - onChanged(); - return this; - } - /** - * .SvrMsgId msg_id = 8; - * @return This builder for chaining. - */ - public Builder clearMsgId() { - - msgId_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -938,26 +936,26 @@ public emu.grasscutter.net.proto.ShowMessageNotifyOuterClass.ShowMessageNotify g descriptor; static { java.lang.String[] descriptorData = { - "\n\027ShowMessageNotify.proto\032\016MsgParam.prot" + - "o\032\016SvrMsgId.proto\"I\n\021ShowMessageNotify\022\031" + - "\n\006params\030\006 \003(\0132\t.MsgParam\022\031\n\006msg_id\030\010 \001(" + - "\0162\t.SvrMsgIdB\033\n\031emu.grasscutter.net.prot" + + "\n\027ShowMessageNotify.proto\032\016SvrMsgId.prot" + + "o\032\016MsgParam.proto\"I\n\021ShowMessageNotify\022\031" + + "\n\006msg_id\030\003 \001(\0162\t.SvrMsgId\022\031\n\006params\030\006 \003(" + + "\0132\t.MsgParamB\033\n\031emu.grasscutter.net.prot" + "ob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.MsgParamOuterClass.getDescriptor(), emu.grasscutter.net.proto.SvrMsgIdOuterClass.getDescriptor(), + emu.grasscutter.net.proto.MsgParamOuterClass.getDescriptor(), }); internal_static_ShowMessageNotify_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_ShowMessageNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_ShowMessageNotify_descriptor, - new java.lang.String[] { "Params", "MsgId", }); - emu.grasscutter.net.proto.MsgParamOuterClass.getDescriptor(); + new java.lang.String[] { "MsgId", "Params", }); emu.grasscutter.net.proto.SvrMsgIdOuterClass.getDescriptor(); + emu.grasscutter.net.proto.MsgParamOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeReqOuterClass.java index 12c52f4eda2..21d1e86cc22 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeReqOuterClass.java @@ -39,6 +39,7 @@ public interface SkipPlayerGameTimeReqOrBuilder extends /** * 
    * CmdId: 29432
+   * obf: NOPCMMBLIOD
    *
* * Protobuf type {@code SkipPlayerGameTimeReq} @@ -346,6 +347,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 29432
+     * obf: NOPCMMBLIOD
      *
* * Protobuf type {@code SkipPlayerGameTimeReq} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeRspOuterClass.java index ce2da22009b..a2a835276a3 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeRspOuterClass.java @@ -18,6 +18,23 @@ public interface SkipPlayerGameTimeRspOrBuilder extends // @@protoc_insertion_point(interface_extends:SkipPlayerGameTimeRsp) com.google.protobuf.MessageOrBuilder { + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @return A list containing the aEPPKCKCIBP. + */ + java.util.List getAEPPKCKCIBPList(); + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @return The count of aEPPKCKCIBP. + */ + int getAEPPKCKCIBPCount(); + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @param index The index of the element to return. + * @return The aEPPKCKCIBP at the given index. + */ + int getAEPPKCKCIBP(int index); + /** * int32 retcode = 6; * @return The retcode. @@ -39,6 +56,7 @@ public interface SkipPlayerGameTimeRspOrBuilder extends /** * 
    * CmdId: 338
+   * obf: OKICBJHLHLF
    *
* * Protobuf type {@code SkipPlayerGameTimeRsp} @@ -53,6 +71,7 @@ private SkipPlayerGameTimeRsp(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } private SkipPlayerGameTimeRsp() { + aEPPKCKCIBP_ = emptyIntList(); } @java.lang.Override @@ -75,6 +94,7 @@ private SkipPlayerGameTimeRsp( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -85,6 +105,27 @@ private SkipPlayerGameTimeRsp( case 0: done = true; break; + case 32: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + aEPPKCKCIBP_ = newIntList(); + mutable_bitField0_ |= 0x00000001; + } + aEPPKCKCIBP_.addInt(input.readUInt32()); + break; + } + case 34: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { + aEPPKCKCIBP_ = newIntList(); + mutable_bitField0_ |= 0x00000001; + } + while (input.getBytesUntilLimit() > 0) { + aEPPKCKCIBP_.addInt(input.readUInt32()); + } + input.popLimit(limit); + break; + } case 48: { retcode_ = input.readInt32(); @@ -115,6 +156,9 @@ private SkipPlayerGameTimeRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + aEPPKCKCIBP_.makeImmutable(); // C + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -132,6 +176,34 @@ private SkipPlayerGameTimeRsp( emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.class, emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.Builder.class); } + public static final int AEPPKCKCIBP_FIELD_NUMBER = 4; + private com.google.protobuf.Internal.IntList aEPPKCKCIBP_; + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @return A list containing the aEPPKCKCIBP. + */ + @java.lang.Override + public java.util.List + getAEPPKCKCIBPList() { + return aEPPKCKCIBP_; + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @return The count of aEPPKCKCIBP. + */ + public int getAEPPKCKCIBPCount() { + return aEPPKCKCIBP_.size(); + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @param index The index of the element to return. + * @return The aEPPKCKCIBP at the given index. + */ + public int getAEPPKCKCIBP(int index) { + return aEPPKCKCIBP_.getInt(index); + } + private int aEPPKCKCIBPMemoizedSerializedSize = -1; + public static final int RETCODE_FIELD_NUMBER = 6; private int retcode_; /** @@ -179,6 +251,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + getSerializedSize(); + if (getAEPPKCKCIBPList().size() > 0) { + output.writeUInt32NoTag(34); + output.writeUInt32NoTag(aEPPKCKCIBPMemoizedSerializedSize); + } + for (int i = 0; i < aEPPKCKCIBP_.size(); i++) { + output.writeUInt32NoTag(aEPPKCKCIBP_.getInt(i)); + } if (retcode_ != 0) { output.writeInt32(6, retcode_); } @@ -197,6 +277,20 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + { + int dataSize = 0; + for (int i = 0; i < aEPPKCKCIBP_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt32SizeNoTag(aEPPKCKCIBP_.getInt(i)); + } + size += dataSize; + if (!getAEPPKCKCIBPList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + aEPPKCKCIBPMemoizedSerializedSize = dataSize; + } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream .computeInt32Size(6, retcode_); @@ -224,6 +318,8 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp other = (emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp) obj; + if (!getAEPPKCKCIBPList() + .equals(other.getAEPPKCKCIBPList())) return false; if (getRetcode() != other.getRetcode()) return false; if (getClientGameTime() @@ -241,6 +337,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (getAEPPKCKCIBPCount() > 0) { + hash = (37 * hash) + AEPPKCKCIBP_FIELD_NUMBER; + hash = (53 * hash) + getAEPPKCKCIBPList().hashCode(); + } hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); hash = (37 * hash) + CLIENT_GAME_TIME_FIELD_NUMBER; @@ -345,6 +445,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 338
+     * obf: OKICBJHLHLF
      *
* * Protobuf type {@code SkipPlayerGameTimeRsp} @@ -384,6 +485,8 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + aEPPKCKCIBP_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); retcode_ = 0; clientGameTime_ = 0; @@ -416,6 +519,12 @@ public emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameT @java.lang.Override public emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp buildPartial() { emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp result = new emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp(this); + int from_bitField0_ = bitField0_; + if (((bitField0_ & 0x00000001) != 0)) { + aEPPKCKCIBP_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.aEPPKCKCIBP_ = aEPPKCKCIBP_; result.retcode_ = retcode_; result.clientGameTime_ = clientGameTime_; result.gameTime_ = gameTime_; @@ -467,6 +576,16 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp other) { if (other == emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.getDefaultInstance()) return this; + if (!other.aEPPKCKCIBP_.isEmpty()) { + if (aEPPKCKCIBP_.isEmpty()) { + aEPPKCKCIBP_ = other.aEPPKCKCIBP_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureAEPPKCKCIBPIsMutable(); + aEPPKCKCIBP_.addAll(other.aEPPKCKCIBP_); + } + onChanged(); + } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } @@ -504,6 +623,86 @@ public Builder mergeFrom( } return this; } + private int bitField0_; + + private com.google.protobuf.Internal.IntList aEPPKCKCIBP_ = emptyIntList(); + private void ensureAEPPKCKCIBPIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + aEPPKCKCIBP_ = mutableCopy(aEPPKCKCIBP_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @return A list containing the aEPPKCKCIBP. + */ + public java.util.List + getAEPPKCKCIBPList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(aEPPKCKCIBP_) : aEPPKCKCIBP_; + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @return The count of aEPPKCKCIBP. + */ + public int getAEPPKCKCIBPCount() { + return aEPPKCKCIBP_.size(); + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @param index The index of the element to return. + * @return The aEPPKCKCIBP at the given index. + */ + public int getAEPPKCKCIBP(int index) { + return aEPPKCKCIBP_.getInt(index); + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @param index The index to set the value at. + * @param value The aEPPKCKCIBP to set. + * @return This builder for chaining. + */ + public Builder setAEPPKCKCIBP( + int index, int value) { + ensureAEPPKCKCIBPIsMutable(); + aEPPKCKCIBP_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @param value The aEPPKCKCIBP to add. + * @return This builder for chaining. + */ + public Builder addAEPPKCKCIBP(int value) { + ensureAEPPKCKCIBPIsMutable(); + aEPPKCKCIBP_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @param values The aEPPKCKCIBP to add. + * @return This builder for chaining. + */ + public Builder addAllAEPPKCKCIBP( + java.lang.Iterable values) { + ensureAEPPKCKCIBPIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, aEPPKCKCIBP_); + onChanged(); + return this; + } + /** + * repeated uint32 AEPPKCKCIBP = 4; + * @return This builder for chaining. + */ + public Builder clearAEPPKCKCIBP() { + aEPPKCKCIBP_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } private int retcode_ ; /** @@ -664,10 +863,11 @@ public emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameT descriptor; static { java.lang.String[] descriptorData = { - "\n\033SkipPlayerGameTimeRsp.proto\"U\n\025SkipPla" + - "yerGameTimeRsp\022\017\n\007retcode\030\006 \001(\005\022\030\n\020clien" + - "t_game_time\030\007 \001(\r\022\021\n\tgame_time\030\r \001(\rB\033\n\031" + - "emu.grasscutter.net.protob\006proto3" + "\n\033SkipPlayerGameTimeRsp.proto\"j\n\025SkipPla" + + "yerGameTimeRsp\022\023\n\013AEPPKCKCIBP\030\004 \003(\r\022\017\n\007r" + + "etcode\030\006 \001(\005\022\030\n\020client_game_time\030\007 \001(\r\022\021" + + "\n\tgame_time\030\r \001(\rB\033\n\031emu.grasscutter.net" + + ".protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -678,7 +878,7 @@ public emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameT internal_static_SkipPlayerGameTimeRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SkipPlayerGameTimeRsp_descriptor, - new java.lang.String[] { "Retcode", "ClientGameTime", "GameTime", }); + new java.lang.String[] { "AEPPKCKCIBP", "Retcode", "ClientGameTime", "GameTime", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StartCoopPointReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StartCoopPointReqOuterClass.java index 5bf6e5aba40..0f8a6e359f3 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/StartCoopPointReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/StartCoopPointReqOuterClass.java @@ -19,15 +19,15 @@ public interface StartCoopPointReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 coop_point = 8; + * uint32 coop_point = 7; * @return The coopPoint. */ int getCoopPoint(); } /** * 
-   * CmdId: 22463
-   * Obf: NEHKCPAFDAI
+   * CmdId: 27436
+   * obf: PPGIKABMIAK
    *
* * Protobuf type {@code StartCoopPointReq} @@ -74,7 +74,7 @@ private StartCoopPointReq( case 0: done = true; break; - case 64: { + case 56: { coopPoint_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ private StartCoopPointReq( emu.grasscutter.net.proto.StartCoopPointReqOuterClass.StartCoopPointReq.class, emu.grasscutter.net.proto.StartCoopPointReqOuterClass.StartCoopPointReq.Builder.class); } - public static final int COOP_POINT_FIELD_NUMBER = 8; + public static final int COOP_POINT_FIELD_NUMBER = 7; private int coopPoint_; /** - * uint32 coop_point = 8; + * uint32 coop_point = 7; * @return The coopPoint. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (coopPoint_ != 0) { - output.writeUInt32(8, coopPoint_); + output.writeUInt32(7, coopPoint_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (coopPoint_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, coopPoint_); + .computeUInt32Size(7, coopPoint_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 22463
-     * Obf: NEHKCPAFDAI
+     * CmdId: 27436
+     * obf: PPGIKABMIAK
      *
* * Protobuf type {@code StartCoopPointReq} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int coopPoint_ ; /** - * uint32 coop_point = 8; + * uint32 coop_point = 7; * @return The coopPoint. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getCoopPoint() { return coopPoint_; } /** - * uint32 coop_point = 8; + * uint32 coop_point = 7; * @param value The coopPoint to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setCoopPoint(int value) { return this; } /** - * uint32 coop_point = 8; + * uint32 coop_point = 7; * @return This builder for chaining. */ public Builder clearCoopPoint() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.StartCoopPointReqOuterClass.StartCoopPointReq g static { java.lang.String[] descriptorData = { "\n\027StartCoopPointReq.proto\"\'\n\021StartCoopPo" + - "intReq\022\022\n\ncoop_point\030\010 \001(\rB\033\n\031emu.grassc" + + "intReq\022\022\n\ncoop_point\030\007 \001(\rB\033\n\031emu.grassc" + "utter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StartCoopPointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StartCoopPointRspOuterClass.java index f42761fc851..1882b3ae3c8 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/StartCoopPointRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/StartCoopPointRspOuterClass.java @@ -19,42 +19,42 @@ public interface StartCoopPointRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .MainCoop start_main_coop = 1; + * int32 retcode = 8; + * @return The retcode. + */ + int getRetcode(); + + /** + * bool is_start = 9; + * @return The isStart. + */ + boolean getIsStart(); + + /** + * .MainCoop start_main_coop = 10; * @return Whether the startMainCoop field is set. */ boolean hasStartMainCoop(); /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; * @return The startMainCoop. */ emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop getStartMainCoop(); /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ emu.grasscutter.net.proto.MainCoopOuterClass.MainCoopOrBuilder getStartMainCoopOrBuilder(); /** - * uint32 coop_point = 2; + * uint32 coop_point = 12; * @return The coopPoint. */ int getCoopPoint(); - - /** - * int32 retcode = 14; - * @return The retcode. - */ - int getRetcode(); - - /** - * bool is_start = 6; - * @return The isStart. - */ - boolean getIsStart(); } /** * 
-   * CmdId: 1231
-   * Obf: LHBINHPHFKM
+   * CmdId: 2147
+   * obf: GCIGEBDOPID
    *
* * Protobuf type {@code StartCoopPointRsp} @@ -101,7 +101,17 @@ private StartCoopPointRsp( case 0: done = true; break; - case 10: { + case 64: { + + retcode_ = input.readInt32(); + break; + } + case 72: { + + isStart_ = input.readBool(); + break; + } + case 82: { emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Builder subBuilder = null; if (startMainCoop_ != null) { subBuilder = startMainCoop_.toBuilder(); @@ -114,21 +124,11 @@ private StartCoopPointRsp( break; } - case 16: { + case 96: { coopPoint_ = input.readUInt32(); break; } - case 48: { - - isStart_ = input.readBool(); - break; - } - case 112: { - - retcode_ = input.readInt32(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -161,10 +161,32 @@ private StartCoopPointRsp( emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp.class, emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp.Builder.class); } - public static final int START_MAIN_COOP_FIELD_NUMBER = 1; + public static final int RETCODE_FIELD_NUMBER = 8; + private int retcode_; + /** + * int32 retcode = 8; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int IS_START_FIELD_NUMBER = 9; + private boolean isStart_; + /** + * bool is_start = 9; + * @return The isStart. + */ + @java.lang.Override + public boolean getIsStart() { + return isStart_; + } + + public static final int START_MAIN_COOP_FIELD_NUMBER = 10; private emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop startMainCoop_; /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; * @return Whether the startMainCoop field is set. */ @java.lang.Override @@ -172,7 +194,7 @@ public boolean hasStartMainCoop() { return startMainCoop_ != null; } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; * @return The startMainCoop. */ @java.lang.Override @@ -180,17 +202,17 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop getStartMainCoop() return startMainCoop_ == null ? emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.getDefaultInstance() : startMainCoop_; } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ @java.lang.Override public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoopOrBuilder getStartMainCoopOrBuilder() { return getStartMainCoop(); } - public static final int COOP_POINT_FIELD_NUMBER = 2; + public static final int COOP_POINT_FIELD_NUMBER = 12; private int coopPoint_; /** - * uint32 coop_point = 2; + * uint32 coop_point = 12; * @return The coopPoint. */ @java.lang.Override @@ -198,28 +220,6 @@ public int getCoopPoint() { return coopPoint_; } - public static final int RETCODE_FIELD_NUMBER = 14; - private int retcode_; - /** - * int32 retcode = 14; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int IS_START_FIELD_NUMBER = 6; - private boolean isStart_; - /** - * bool is_start = 6; - * @return The isStart. - */ - @java.lang.Override - public boolean getIsStart() { - return isStart_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -234,17 +234,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (startMainCoop_ != null) { - output.writeMessage(1, getStartMainCoop()); - } - if (coopPoint_ != 0) { - output.writeUInt32(2, coopPoint_); + if (retcode_ != 0) { + output.writeInt32(8, retcode_); } if (isStart_ != false) { - output.writeBool(6, isStart_); + output.writeBool(9, isStart_); } - if (retcode_ != 0) { - output.writeInt32(14, retcode_); + if (startMainCoop_ != null) { + output.writeMessage(10, getStartMainCoop()); + } + if (coopPoint_ != 0) { + output.writeUInt32(12, coopPoint_); } unknownFields.writeTo(output); } @@ -255,21 +255,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (startMainCoop_ != null) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, getStartMainCoop()); + .computeInt32Size(8, retcode_); } - if (coopPoint_ != 0) { + if (isStart_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, coopPoint_); + .computeBoolSize(9, isStart_); } - if (isStart_ != false) { + if (startMainCoop_ != null) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, isStart_); + .computeMessageSize(10, getStartMainCoop()); } - if (retcode_ != 0) { + if (coopPoint_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(14, retcode_); + .computeUInt32Size(12, coopPoint_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -286,6 +286,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp other = (emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp) obj; + if (getRetcode() + != other.getRetcode()) return false; + if (getIsStart() + != other.getIsStart()) return false; if (hasStartMainCoop() != other.hasStartMainCoop()) return false; if (hasStartMainCoop()) { if (!getStartMainCoop() @@ -293,10 +297,6 @@ public boolean equals(final java.lang.Object obj) { } if (getCoopPoint() != other.getCoopPoint()) return false; - if (getRetcode() - != other.getRetcode()) return false; - if (getIsStart() - != other.getIsStart()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -308,17 +308,17 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + IS_START_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsStart()); if (hasStartMainCoop()) { hash = (37 * hash) + START_MAIN_COOP_FIELD_NUMBER; hash = (53 * hash) + getStartMainCoop().hashCode(); } hash = (37 * hash) + COOP_POINT_FIELD_NUMBER; hash = (53 * hash) + getCoopPoint(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + IS_START_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsStart()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -416,8 +416,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 1231
-     * Obf: LHBINHPHFKM
+     * CmdId: 2147
+     * obf: GCIGEBDOPID
      *
* * Protobuf type {@code StartCoopPointRsp} @@ -457,6 +457,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + retcode_ = 0; + + isStart_ = false; + if (startMainCoopBuilder_ == null) { startMainCoop_ = null; } else { @@ -465,10 +469,6 @@ public Builder clear() { } coopPoint_ = 0; - retcode_ = 0; - - isStart_ = false; - return this; } @@ -495,14 +495,14 @@ public emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp b @java.lang.Override public emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp buildPartial() { emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp result = new emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp(this); + result.retcode_ = retcode_; + result.isStart_ = isStart_; if (startMainCoopBuilder_ == null) { result.startMainCoop_ = startMainCoop_; } else { result.startMainCoop_ = startMainCoopBuilder_.build(); } result.coopPoint_ = coopPoint_; - result.retcode_ = retcode_; - result.isStart_ = isStart_; onBuilt(); return result; } @@ -551,18 +551,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp other) { if (other == emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp.getDefaultInstance()) return this; - if (other.hasStartMainCoop()) { - mergeStartMainCoop(other.getStartMainCoop()); - } - if (other.getCoopPoint() != 0) { - setCoopPoint(other.getCoopPoint()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } if (other.getIsStart() != false) { setIsStart(other.getIsStart()); } + if (other.hasStartMainCoop()) { + mergeStartMainCoop(other.getStartMainCoop()); + } + if (other.getCoopPoint() != 0) { + setCoopPoint(other.getCoopPoint()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -592,18 +592,80 @@ public Builder mergeFrom( return this; } + private int retcode_ ; + /** + * int32 retcode = 8; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 8; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 8; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + + private boolean isStart_ ; + /** + * bool is_start = 9; + * @return The isStart. + */ + @java.lang.Override + public boolean getIsStart() { + return isStart_; + } + /** + * bool is_start = 9; + * @param value The isStart to set. + * @return This builder for chaining. + */ + public Builder setIsStart(boolean value) { + + isStart_ = value; + onChanged(); + return this; + } + /** + * bool is_start = 9; + * @return This builder for chaining. + */ + public Builder clearIsStart() { + + isStart_ = false; + onChanged(); + return this; + } + private emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop startMainCoop_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop, emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Builder, emu.grasscutter.net.proto.MainCoopOuterClass.MainCoopOrBuilder> startMainCoopBuilder_; /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; * @return Whether the startMainCoop field is set. */ public boolean hasStartMainCoop() { return startMainCoopBuilder_ != null || startMainCoop_ != null; } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; * @return The startMainCoop. */ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop getStartMainCoop() { @@ -614,7 +676,7 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop getStartMainCoop() } } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ public Builder setStartMainCoop(emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop value) { if (startMainCoopBuilder_ == null) { @@ -630,7 +692,7 @@ public Builder setStartMainCoop(emu.grasscutter.net.proto.MainCoopOuterClass.Mai return this; } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ public Builder setStartMainCoop( emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Builder builderForValue) { @@ -644,7 +706,7 @@ public Builder setStartMainCoop( return this; } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ public Builder mergeStartMainCoop(emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop value) { if (startMainCoopBuilder_ == null) { @@ -662,7 +724,7 @@ public Builder mergeStartMainCoop(emu.grasscutter.net.proto.MainCoopOuterClass.M return this; } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ public Builder clearStartMainCoop() { if (startMainCoopBuilder_ == null) { @@ -676,7 +738,7 @@ public Builder clearStartMainCoop() { return this; } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Builder getStartMainCoopBuilder() { @@ -684,7 +746,7 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Builder getStartMai return getStartMainCoopFieldBuilder().getBuilder(); } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoopOrBuilder getStartMainCoopOrBuilder() { if (startMainCoopBuilder_ != null) { @@ -695,7 +757,7 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoopOrBuilder getStartMa } } /** - * .MainCoop start_main_coop = 1; + * .MainCoop start_main_coop = 10; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop, emu.grasscutter.net.proto.MainCoopOuterClass.MainCoop.Builder, emu.grasscutter.net.proto.MainCoopOuterClass.MainCoopOrBuilder> @@ -713,7 +775,7 @@ public emu.grasscutter.net.proto.MainCoopOuterClass.MainCoopOrBuilder getStartMa private int coopPoint_ ; /** - * uint32 coop_point = 2; + * uint32 coop_point = 12; * @return The coopPoint. */ @java.lang.Override @@ -721,7 +783,7 @@ public int getCoopPoint() { return coopPoint_; } /** - * uint32 coop_point = 2; + * uint32 coop_point = 12; * @param value The coopPoint to set. * @return This builder for chaining. */ @@ -732,7 +794,7 @@ public Builder setCoopPoint(int value) { return this; } /** - * uint32 coop_point = 2; + * uint32 coop_point = 12; * @return This builder for chaining. */ public Builder clearCoopPoint() { @@ -741,68 +803,6 @@ public Builder clearCoopPoint() { onChanged(); return this; } - - private int retcode_ ; - /** - * int32 retcode = 14; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 14; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 14; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - - private boolean isStart_ ; - /** - * bool is_start = 6; - * @return The isStart. - */ - @java.lang.Override - public boolean getIsStart() { - return isStart_; - } - /** - * bool is_start = 6; - * @param value The isStart to set. - * @return This builder for chaining. - */ - public Builder setIsStart(boolean value) { - - isStart_ = value; - onChanged(); - return this; - } - /** - * bool is_start = 6; - * @return This builder for chaining. - */ - public Builder clearIsStart() { - - isStart_ = false; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -871,9 +871,9 @@ public emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp g static { java.lang.String[] descriptorData = { "\n\027StartCoopPointRsp.proto\032\016MainCoop.prot" + - "o\"n\n\021StartCoopPointRsp\022\"\n\017start_main_coo" + - "p\030\001 \001(\0132\t.MainCoop\022\022\n\ncoop_point\030\002 \001(\r\022\017" + - "\n\007retcode\030\016 \001(\005\022\020\n\010is_start\030\006 \001(\010B\033\n\031emu" + + "o\"n\n\021StartCoopPointRsp\022\017\n\007retcode\030\010 \001(\005\022" + + "\020\n\010is_start\030\t \001(\010\022\"\n\017start_main_coop\030\n \001" + + "(\0132\t.MainCoop\022\022\n\ncoop_point\030\014 \001(\rB\033\n\031emu" + ".grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -886,7 +886,7 @@ public emu.grasscutter.net.proto.StartCoopPointRspOuterClass.StartCoopPointRsp g internal_static_StartCoopPointRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_StartCoopPointRsp_descriptor, - new java.lang.String[] { "StartMainCoop", "CoopPoint", "Retcode", "IsStart", }); + new java.lang.String[] { "Retcode", "IsStart", "StartMainCoop", "CoopPoint", }); emu.grasscutter.net.proto.MainCoopOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StoreItemDelNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StoreItemDelNotifyOuterClass.java index 4d99842b7ab..d83c47f02b5 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/StoreItemDelNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/StoreItemDelNotifyOuterClass.java @@ -47,6 +47,11 @@ public interface StoreItemDelNotifyOrBuilder extends emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType(); } /** + * 
+   * CmdId: 9567
+   * obf: PGNLACLONKK
+   *
+ * * Protobuf type {@code StoreItemDelNotify} */ public static final class StoreItemDelNotify extends @@ -386,6 +391,11 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 9567
+     * obf: PGNLACLONKK
+     *
+ * * Protobuf type {@code StoreItemDelNotify} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StrengthenPointDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StrengthenPointDataOuterClass.java index df9b79c5a02..4de089f7d96 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/StrengthenPointDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/StrengthenPointDataOuterClass.java @@ -31,10 +31,6 @@ public interface StrengthenPointDataOrBuilder extends int getCurPoint(); } /** - * 
-   * 5.0.0
-   *
- * * Protobuf type {@code StrengthenPointData} */ public static final class StrengthenPointData extends @@ -310,10 +306,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * 5.0.0
-     *
- * * Protobuf type {@code StrengthenPointData} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SummerTimeV2DungeonSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SummerTimeV2DungeonSettleInfoOuterClass.java index 6a23f5084ed..a2ddc7d97fa 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SummerTimeV2DungeonSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SummerTimeV2DungeonSettleInfoOuterClass.java @@ -19,28 +19,24 @@ public interface SummerTimeV2DungeonSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_success = 9; - * @return The isSuccess. + * uint32 LDKGGLBBJGE = 3; + * @return The lDKGGLBBJGE. */ - boolean getIsSuccess(); + int getLDKGGLBBJGE(); /** - * uint32 LMALLBDPKGO = 3; - * @return The lMALLBDPKGO. + * bool is_success = 8; + * @return The isSuccess. */ - int getLMALLBDPKGO(); + boolean getIsSuccess(); /** - * uint32 MBINEBFILLF = 8; - * @return The mBINEBFILLF. + * uint32 PPHPLCHINJO = 11; + * @return The pPHPLCHINJO. */ - int getMBINEBFILLF(); + int getPPHPLCHINJO(); } /** - * 
-   * Obf: GDCAPLGGPNE
-   *
- * * Protobuf type {@code SummerTimeV2DungeonSettleInfo} */ public static final class SummerTimeV2DungeonSettleInfo extends @@ -87,17 +83,17 @@ private SummerTimeV2DungeonSettleInfo( break; case 24: { - lMALLBDPKGO_ = input.readUInt32(); + lDKGGLBBJGE_ = input.readUInt32(); break; } case 64: { - mBINEBFILLF_ = input.readUInt32(); + isSuccess_ = input.readBool(); break; } - case 72: { + case 88: { - isSuccess_ = input.readBool(); + pPHPLCHINJO_ = input.readUInt32(); break; } default: { @@ -132,37 +128,37 @@ private SummerTimeV2DungeonSettleInfo( emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.class, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder.class); } - public static final int IS_SUCCESS_FIELD_NUMBER = 9; - private boolean isSuccess_; + public static final int LDKGGLBBJGE_FIELD_NUMBER = 3; + private int lDKGGLBBJGE_; /** - * bool is_success = 9; - * @return The isSuccess. + * uint32 LDKGGLBBJGE = 3; + * @return The lDKGGLBBJGE. */ @java.lang.Override - public boolean getIsSuccess() { - return isSuccess_; + public int getLDKGGLBBJGE() { + return lDKGGLBBJGE_; } - public static final int LMALLBDPKGO_FIELD_NUMBER = 3; - private int lMALLBDPKGO_; + public static final int IS_SUCCESS_FIELD_NUMBER = 8; + private boolean isSuccess_; /** - * uint32 LMALLBDPKGO = 3; - * @return The lMALLBDPKGO. + * bool is_success = 8; + * @return The isSuccess. */ @java.lang.Override - public int getLMALLBDPKGO() { - return lMALLBDPKGO_; + public boolean getIsSuccess() { + return isSuccess_; } - public static final int MBINEBFILLF_FIELD_NUMBER = 8; - private int mBINEBFILLF_; + public static final int PPHPLCHINJO_FIELD_NUMBER = 11; + private int pPHPLCHINJO_; /** - * uint32 MBINEBFILLF = 8; - * @return The mBINEBFILLF. + * uint32 PPHPLCHINJO = 11; + * @return The pPHPLCHINJO. */ @java.lang.Override - public int getMBINEBFILLF() { - return mBINEBFILLF_; + public int getPPHPLCHINJO() { + return pPHPLCHINJO_; } private byte memoizedIsInitialized = -1; @@ -179,14 +175,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (lMALLBDPKGO_ != 0) { - output.writeUInt32(3, lMALLBDPKGO_); - } - if (mBINEBFILLF_ != 0) { - output.writeUInt32(8, mBINEBFILLF_); + if (lDKGGLBBJGE_ != 0) { + output.writeUInt32(3, lDKGGLBBJGE_); } if (isSuccess_ != false) { - output.writeBool(9, isSuccess_); + output.writeBool(8, isSuccess_); + } + if (pPHPLCHINJO_ != 0) { + output.writeUInt32(11, pPHPLCHINJO_); } unknownFields.writeTo(output); } @@ -197,17 +193,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (lMALLBDPKGO_ != 0) { + if (lDKGGLBBJGE_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, lMALLBDPKGO_); + .computeUInt32Size(3, lDKGGLBBJGE_); } - if (mBINEBFILLF_ != 0) { + if (isSuccess_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, mBINEBFILLF_); + .computeBoolSize(8, isSuccess_); } - if (isSuccess_ != false) { + if (pPHPLCHINJO_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(9, isSuccess_); + .computeUInt32Size(11, pPHPLCHINJO_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -224,12 +220,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo other = (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) obj; + if (getLDKGGLBBJGE() + != other.getLDKGGLBBJGE()) return false; if (getIsSuccess() != other.getIsSuccess()) return false; - if (getLMALLBDPKGO() - != other.getLMALLBDPKGO()) return false; - if (getMBINEBFILLF() - != other.getMBINEBFILLF()) return false; + if (getPPHPLCHINJO() + != other.getPPHPLCHINJO()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -241,13 +237,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + LDKGGLBBJGE_FIELD_NUMBER; + hash = (53 * hash) + getLDKGGLBBJGE(); hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSuccess()); - hash = (37 * hash) + LMALLBDPKGO_FIELD_NUMBER; - hash = (53 * hash) + getLMALLBDPKGO(); - hash = (37 * hash) + MBINEBFILLF_FIELD_NUMBER; - hash = (53 * hash) + getMBINEBFILLF(); + hash = (37 * hash) + PPHPLCHINJO_FIELD_NUMBER; + hash = (53 * hash) + getPPHPLCHINJO(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -344,10 +340,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: GDCAPLGGPNE
-     *
- * * Protobuf type {@code SummerTimeV2DungeonSettleInfo} */ public static final class Builder extends @@ -385,11 +377,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isSuccess_ = false; + lDKGGLBBJGE_ = 0; - lMALLBDPKGO_ = 0; + isSuccess_ = false; - mBINEBFILLF_ = 0; + pPHPLCHINJO_ = 0; return this; } @@ -417,9 +409,9 @@ public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerT @java.lang.Override public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo buildPartial() { emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo result = new emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo(this); + result.lDKGGLBBJGE_ = lDKGGLBBJGE_; result.isSuccess_ = isSuccess_; - result.lMALLBDPKGO_ = lMALLBDPKGO_; - result.mBINEBFILLF_ = mBINEBFILLF_; + result.pPHPLCHINJO_ = pPHPLCHINJO_; onBuilt(); return result; } @@ -468,14 +460,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo other) { if (other == emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance()) return this; + if (other.getLDKGGLBBJGE() != 0) { + setLDKGGLBBJGE(other.getLDKGGLBBJGE()); + } if (other.getIsSuccess() != false) { setIsSuccess(other.getIsSuccess()); } - if (other.getLMALLBDPKGO() != 0) { - setLMALLBDPKGO(other.getLMALLBDPKGO()); - } - if (other.getMBINEBFILLF() != 0) { - setMBINEBFILLF(other.getMBINEBFILLF()); + if (other.getPPHPLCHINJO() != 0) { + setPPHPLCHINJO(other.getPPHPLCHINJO()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -506,95 +498,95 @@ public Builder mergeFrom( return this; } - private boolean isSuccess_ ; + private int lDKGGLBBJGE_ ; /** - * bool is_success = 9; - * @return The isSuccess. + * uint32 LDKGGLBBJGE = 3; + * @return The lDKGGLBBJGE. */ @java.lang.Override - public boolean getIsSuccess() { - return isSuccess_; + public int getLDKGGLBBJGE() { + return lDKGGLBBJGE_; } /** - * bool is_success = 9; - * @param value The isSuccess to set. + * uint32 LDKGGLBBJGE = 3; + * @param value The lDKGGLBBJGE to set. * @return This builder for chaining. */ - public Builder setIsSuccess(boolean value) { + public Builder setLDKGGLBBJGE(int value) { - isSuccess_ = value; + lDKGGLBBJGE_ = value; onChanged(); return this; } /** - * bool is_success = 9; + * uint32 LDKGGLBBJGE = 3; * @return This builder for chaining. */ - public Builder clearIsSuccess() { + public Builder clearLDKGGLBBJGE() { - isSuccess_ = false; + lDKGGLBBJGE_ = 0; onChanged(); return this; } - private int lMALLBDPKGO_ ; + private boolean isSuccess_ ; /** - * uint32 LMALLBDPKGO = 3; - * @return The lMALLBDPKGO. + * bool is_success = 8; + * @return The isSuccess. */ @java.lang.Override - public int getLMALLBDPKGO() { - return lMALLBDPKGO_; + public boolean getIsSuccess() { + return isSuccess_; } /** - * uint32 LMALLBDPKGO = 3; - * @param value The lMALLBDPKGO to set. + * bool is_success = 8; + * @param value The isSuccess to set. * @return This builder for chaining. */ - public Builder setLMALLBDPKGO(int value) { + public Builder setIsSuccess(boolean value) { - lMALLBDPKGO_ = value; + isSuccess_ = value; onChanged(); return this; } /** - * uint32 LMALLBDPKGO = 3; + * bool is_success = 8; * @return This builder for chaining. */ - public Builder clearLMALLBDPKGO() { + public Builder clearIsSuccess() { - lMALLBDPKGO_ = 0; + isSuccess_ = false; onChanged(); return this; } - private int mBINEBFILLF_ ; + private int pPHPLCHINJO_ ; /** - * uint32 MBINEBFILLF = 8; - * @return The mBINEBFILLF. + * uint32 PPHPLCHINJO = 11; + * @return The pPHPLCHINJO. */ @java.lang.Override - public int getMBINEBFILLF() { - return mBINEBFILLF_; + public int getPPHPLCHINJO() { + return pPHPLCHINJO_; } /** - * uint32 MBINEBFILLF = 8; - * @param value The mBINEBFILLF to set. + * uint32 PPHPLCHINJO = 11; + * @param value The pPHPLCHINJO to set. * @return This builder for chaining. */ - public Builder setMBINEBFILLF(int value) { + public Builder setPPHPLCHINJO(int value) { - mBINEBFILLF_ = value; + pPHPLCHINJO_ = value; onChanged(); return this; } /** - * uint32 MBINEBFILLF = 8; + * uint32 PPHPLCHINJO = 11; * @return This builder for chaining. */ - public Builder clearMBINEBFILLF() { + public Builder clearPPHPLCHINJO() { - mBINEBFILLF_ = 0; + pPHPLCHINJO_ = 0; onChanged(); return this; } @@ -666,9 +658,9 @@ public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerT static { java.lang.String[] descriptorData = { "\n#SummerTimeV2DungeonSettleInfo.proto\"]\n" + - "\035SummerTimeV2DungeonSettleInfo\022\022\n\nis_suc" + - "cess\030\t \001(\010\022\023\n\013LMALLBDPKGO\030\003 \001(\r\022\023\n\013MBINE" + - "BFILLF\030\010 \001(\rB\033\n\031emu.grasscutter.net.prot" + + "\035SummerTimeV2DungeonSettleInfo\022\023\n\013LDKGGL" + + "BBJGE\030\003 \001(\r\022\022\n\nis_success\030\010 \001(\010\022\023\n\013PPHPL" + + "CHINJO\030\013 \001(\rB\033\n\031emu.grasscutter.net.prot" + "ob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +672,7 @@ public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerT internal_static_SummerTimeV2DungeonSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_SummerTimeV2DungeonSettleInfo_descriptor, - new java.lang.String[] { "IsSuccess", "LMALLBDPKGO", "MBINEBFILLF", }); + new java.lang.String[] { "LDKGGLBBJGE", "IsSuccess", "PPHPLCHINJO", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SvrMsgIdOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SvrMsgIdOuterClass.java index 67f638170bf..e35e5174a6b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/SvrMsgIdOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/SvrMsgIdOuterClass.java @@ -15,10 +15,6 @@ public static void registerAllExtensions( (com.google.protobuf.ExtensionRegistryLite) registry); } /** - * 
-   * Obf: MGJMJBMPFPG
-   *
- * * Protobuf enum {@code SvrMsgId} */ public enum SvrMsgId @@ -47,10 +43,6 @@ public enum SvrMsgId * MSG_ROUTINE_TYPE_REWARD_MAX_NUM = 5; */ MSG_ROUTINE_TYPE_REWARD_MAX_NUM(5), - /** - * MSG_MECHANICUS_COIN_LIMIT = 6; - */ - MSG_MECHANICUS_COIN_LIMIT(6), UNRECOGNIZED(-1), ; @@ -78,10 +70,6 @@ public enum SvrMsgId * MSG_ROUTINE_TYPE_REWARD_MAX_NUM = 5; */ public static final int MSG_ROUTINE_TYPE_REWARD_MAX_NUM_VALUE = 5; - /** - * MSG_MECHANICUS_COIN_LIMIT = 6; - */ - public static final int MSG_MECHANICUS_COIN_LIMIT_VALUE = 6; public final int getNumber() { @@ -114,7 +102,6 @@ public static SvrMsgId forNumber(int value) { case 3: return MSG_DAILY_TASK_REWARD_MAX_NUM; case 4: return MSG_ROUTINE_TYPE_NOT_OPEN; case 5: return MSG_ROUTINE_TYPE_REWARD_MAX_NUM; - case 6: return MSG_MECHANICUS_COIN_LIMIT; default: return null; } } @@ -180,14 +167,13 @@ private SvrMsgId(int value) { descriptor; static { java.lang.String[] descriptorData = { - "\n\016SvrMsgId.proto*\343\001\n\010SvrMsgId\022\017\n\013MSG_UNK" + + "\n\016SvrMsgId.proto*\304\001\n\010SvrMsgId\022\017\n\013MSG_UNK" + "NOWN\020\000\022\037\n\033MSG_BLOCK_REFRESH_COUNTDOWN\020\001\022" + "\037\n\033MSG_AVATAR_REVIVE_BY_STATUE\020\002\022!\n\035MSG_" + "DAILY_TASK_REWARD_MAX_NUM\020\003\022\035\n\031MSG_ROUTI" + "NE_TYPE_NOT_OPEN\020\004\022#\n\037MSG_ROUTINE_TYPE_R" + - "EWARD_MAX_NUM\020\005\022\035\n\031MSG_MECHANICUS_COIN_L" + - "IMIT\020\006B\033\n\031emu.grasscutter.net.protob\006pro" + - "to3" + "EWARD_MAX_NUM\020\005B\033\n\031emu.grasscutter.net.p" + + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementGoalRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementGoalRewardReqOuterClass.java index 325e864e00b..9c3f27326dc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementGoalRewardReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementGoalRewardReqOuterClass.java @@ -19,17 +19,17 @@ public interface TakeAchievementGoalRewardReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @return A list containing the idList. */ java.util.List getIdListList(); /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @return The count of idList. */ int getIdListCount(); /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @param index The index of the element to return. * @return The idList at the given index. */ @@ -37,8 +37,7 @@ public interface TakeAchievementGoalRewardReqOrBuilder extends } /** * 
-   * CmdId: 249
-   * Obf: FILFJFONHAK
+   * CmdId: 4455
    *
* * Protobuf type {@code TakeAchievementGoalRewardReq} @@ -87,7 +86,7 @@ private TakeAchievementGoalRewardReq( case 0: done = true; break; - case 64: { + case 88: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { idList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -95,7 +94,7 @@ private TakeAchievementGoalRewardReq( idList_.addInt(input.readUInt32()); break; } - case 66: { + case 90: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -143,10 +142,10 @@ private TakeAchievementGoalRewardReq( emu.grasscutter.net.proto.TakeAchievementGoalRewardReqOuterClass.TakeAchievementGoalRewardReq.class, emu.grasscutter.net.proto.TakeAchievementGoalRewardReqOuterClass.TakeAchievementGoalRewardReq.Builder.class); } - public static final int ID_LIST_FIELD_NUMBER = 8; + public static final int ID_LIST_FIELD_NUMBER = 11; private com.google.protobuf.Internal.IntList idList_; /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @return A list containing the idList. */ @java.lang.Override @@ -155,14 +154,14 @@ private TakeAchievementGoalRewardReq( return idList_; } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @return The count of idList. */ public int getIdListCount() { return idList_.size(); } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @param index The index of the element to return. * @return The idList at the given index. */ @@ -187,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (getIdListList().size() > 0) { - output.writeUInt32NoTag(66); + output.writeUInt32NoTag(90); output.writeUInt32NoTag(idListMemoizedSerializedSize); } for (int i = 0; i < idList_.size(); i++) { @@ -345,8 +344,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 249
-     * Obf: FILFJFONHAK
+     * CmdId: 4455
      *
* * Protobuf type {@code TakeAchievementGoalRewardReq} @@ -516,7 +514,7 @@ private void ensureIdListIsMutable() { } } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @return A list containing the idList. */ public java.util.List @@ -525,14 +523,14 @@ private void ensureIdListIsMutable() { java.util.Collections.unmodifiableList(idList_) : idList_; } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @return The count of idList. */ public int getIdListCount() { return idList_.size(); } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @param index The index of the element to return. * @return The idList at the given index. */ @@ -540,7 +538,7 @@ public int getIdList(int index) { return idList_.getInt(index); } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @param index The index to set the value at. * @param value The idList to set. * @return This builder for chaining. @@ -553,7 +551,7 @@ public Builder setIdList( return this; } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @param value The idList to add. * @return This builder for chaining. */ @@ -564,7 +562,7 @@ public Builder addIdList(int value) { return this; } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @param values The idList to add. * @return This builder for chaining. */ @@ -577,7 +575,7 @@ public Builder addAllIdList( return this; } /** - * repeated uint32 id_list = 8; + * repeated uint32 id_list = 11; * @return This builder for chaining. */ public Builder clearIdList() { @@ -655,7 +653,7 @@ public emu.grasscutter.net.proto.TakeAchievementGoalRewardReqOuterClass.TakeAchi java.lang.String[] descriptorData = { "\n\"TakeAchievementGoalRewardReq.proto\"/\n\034" + "TakeAchievementGoalRewardReq\022\017\n\007id_list\030" + - "\010 \003(\rB\033\n\031emu.grasscutter.net.protob\006prot" + + "\013 \003(\rB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementGoalRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementGoalRewardRspOuterClass.java index e85bbcc1fe0..87be7f10e2e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementGoalRewardRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementGoalRewardRspOuterClass.java @@ -19,56 +19,55 @@ public interface TakeAchievementGoalRewardRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @return A list containing the idList. */ java.util.List getIdListList(); /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @return The count of idList. */ int getIdListCount(); /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @param index The index of the element to return. * @return The idList at the given index. */ int getIdList(int index); /** - * int32 retcode = 10; - * @return The retcode. - */ - int getRetcode(); - - /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ java.util.List getItemListList(); /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index); /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ int getItemListCount(); /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ java.util.List getItemListOrBuilderList(); /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index); + + /** + * int32 retcode = 8; + * @return The retcode. + */ + int getRetcode(); } /** * 
-   * CmdId: 20302
-   * Obf: LHEEBEDENLA
+   * CmdId: 26805
    *
* * Protobuf type {@code TakeAchievementGoalRewardRsp} @@ -118,21 +117,7 @@ private TakeAchievementGoalRewardRsp( case 0: done = true; break; - case 50: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { - itemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - itemList_.add( - input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); - break; - } - case 80: { - - retcode_ = input.readInt32(); - break; - } - case 112: { + case 8: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { idList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -140,7 +125,7 @@ private TakeAchievementGoalRewardRsp( idList_.addInt(input.readUInt32()); break; } - case 114: { + case 10: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -153,6 +138,20 @@ private TakeAchievementGoalRewardRsp( input.popLimit(limit); break; } + case 42: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + itemList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + itemList_.add( + input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); + break; + } + case 64: { + + retcode_ = input.readInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -168,12 +167,12 @@ private TakeAchievementGoalRewardRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { - itemList_ = java.util.Collections.unmodifiableList(itemList_); - } if (((mutable_bitField0_ & 0x00000001) != 0)) { idList_.makeImmutable(); // C } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + itemList_ = java.util.Collections.unmodifiableList(itemList_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -191,10 +190,10 @@ private TakeAchievementGoalRewardRsp( emu.grasscutter.net.proto.TakeAchievementGoalRewardRspOuterClass.TakeAchievementGoalRewardRsp.class, emu.grasscutter.net.proto.TakeAchievementGoalRewardRspOuterClass.TakeAchievementGoalRewardRsp.Builder.class); } - public static final int ID_LIST_FIELD_NUMBER = 14; + public static final int ID_LIST_FIELD_NUMBER = 1; private com.google.protobuf.Internal.IntList idList_; /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @return A list containing the idList. */ @java.lang.Override @@ -203,14 +202,14 @@ private TakeAchievementGoalRewardRsp( return idList_; } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @return The count of idList. */ public int getIdListCount() { return idList_.size(); } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @param index The index of the element to return. * @return The idList at the given index. */ @@ -219,28 +218,17 @@ public int getIdList(int index) { } private int idListMemoizedSerializedSize = -1; - public static final int RETCODE_FIELD_NUMBER = 10; - private int retcode_; - /** - * int32 retcode = 10; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - - public static final int ITEM_LIST_FIELD_NUMBER = 6; + public static final int ITEM_LIST_FIELD_NUMBER = 5; private java.util.List itemList_; /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ @java.lang.Override public java.util.List getItemListList() { return itemList_; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ @java.lang.Override public java.util.List @@ -248,21 +236,21 @@ public java.util.List g return itemList_; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ @java.lang.Override public int getItemListCount() { return itemList_.size(); } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { return itemList_.get(index); } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( @@ -270,6 +258,17 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL return itemList_.get(index); } + public static final int RETCODE_FIELD_NUMBER = 8; + private int retcode_; + /** + * int32 retcode = 8; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -285,19 +284,19 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < itemList_.size(); i++) { - output.writeMessage(6, itemList_.get(i)); - } - if (retcode_ != 0) { - output.writeInt32(10, retcode_); - } if (getIdListList().size() > 0) { - output.writeUInt32NoTag(114); + output.writeUInt32NoTag(10); output.writeUInt32NoTag(idListMemoizedSerializedSize); } for (int i = 0; i < idList_.size(); i++) { output.writeUInt32NoTag(idList_.getInt(i)); } + for (int i = 0; i < itemList_.size(); i++) { + output.writeMessage(5, itemList_.get(i)); + } + if (retcode_ != 0) { + output.writeInt32(8, retcode_); + } unknownFields.writeTo(output); } @@ -307,14 +306,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < itemList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, itemList_.get(i)); - } - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, retcode_); - } { int dataSize = 0; for (int i = 0; i < idList_.size(); i++) { @@ -329,6 +320,14 @@ public int getSerializedSize() { } idListMemoizedSerializedSize = dataSize; } + for (int i = 0; i < itemList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, itemList_.get(i)); + } + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(8, retcode_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -346,10 +345,10 @@ public boolean equals(final java.lang.Object obj) { if (!getIdListList() .equals(other.getIdListList())) return false; - if (getRetcode() - != other.getRetcode()) return false; if (!getItemListList() .equals(other.getItemListList())) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -365,12 +364,12 @@ public int hashCode() { hash = (37 * hash) + ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getIdListList().hashCode(); } - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); if (getItemListCount() > 0) { hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemListList().hashCode(); } + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -468,8 +467,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20302
-     * Obf: LHEEBEDENLA
+     * CmdId: 26805
      *
* * Protobuf type {@code TakeAchievementGoalRewardRsp} @@ -512,14 +510,14 @@ public Builder clear() { super.clear(); idList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - retcode_ = 0; - if (itemListBuilder_ == null) { itemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); } else { itemListBuilder_.clear(); } + retcode_ = 0; + return this; } @@ -552,7 +550,6 @@ public emu.grasscutter.net.proto.TakeAchievementGoalRewardRspOuterClass.TakeAchi bitField0_ = (bitField0_ & ~0x00000001); } result.idList_ = idList_; - result.retcode_ = retcode_; if (itemListBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0)) { itemList_ = java.util.Collections.unmodifiableList(itemList_); @@ -562,6 +559,7 @@ public emu.grasscutter.net.proto.TakeAchievementGoalRewardRspOuterClass.TakeAchi } else { result.itemList_ = itemListBuilder_.build(); } + result.retcode_ = retcode_; onBuilt(); return result; } @@ -620,9 +618,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeAchievementGoalRewardRspO } onChanged(); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (itemListBuilder_ == null) { if (!other.itemList_.isEmpty()) { if (itemList_.isEmpty()) { @@ -649,6 +644,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeAchievementGoalRewardRspO } } } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -687,7 +685,7 @@ private void ensureIdListIsMutable() { } } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @return A list containing the idList. */ public java.util.List @@ -696,14 +694,14 @@ private void ensureIdListIsMutable() { java.util.Collections.unmodifiableList(idList_) : idList_; } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @return The count of idList. */ public int getIdListCount() { return idList_.size(); } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @param index The index of the element to return. * @return The idList at the given index. */ @@ -711,7 +709,7 @@ public int getIdList(int index) { return idList_.getInt(index); } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @param index The index to set the value at. * @param value The idList to set. * @return This builder for chaining. @@ -724,7 +722,7 @@ public Builder setIdList( return this; } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @param value The idList to add. * @return This builder for chaining. */ @@ -735,7 +733,7 @@ public Builder addIdList(int value) { return this; } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @param values The idList to add. * @return This builder for chaining. */ @@ -748,7 +746,7 @@ public Builder addAllIdList( return this; } /** - * repeated uint32 id_list = 14; + * repeated uint32 id_list = 1; * @return This builder for chaining. */ public Builder clearIdList() { @@ -758,37 +756,6 @@ public Builder clearIdList() { return this; } - private int retcode_ ; - /** - * int32 retcode = 10; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 10; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 10; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } - private java.util.List itemList_ = java.util.Collections.emptyList(); private void ensureItemListIsMutable() { @@ -802,7 +769,7 @@ private void ensureItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_; /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public java.util.List getItemListList() { if (itemListBuilder_ == null) { @@ -812,7 +779,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public int getItemListCount() { if (itemListBuilder_ == null) { @@ -822,7 +789,7 @@ public int getItemListCount() { } } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { if (itemListBuilder_ == null) { @@ -832,7 +799,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int i } } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -849,7 +816,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -863,7 +830,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemListBuilder_ == null) { @@ -879,7 +846,7 @@ public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemPar return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -896,7 +863,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder addItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -910,7 +877,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -924,7 +891,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder addAllItemList( java.lang.Iterable values) { @@ -939,7 +906,7 @@ public Builder addAllItemList( return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder clearItemList() { if (itemListBuilder_ == null) { @@ -952,7 +919,7 @@ public Builder clearItemList() { return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public Builder removeItemList(int index) { if (itemListBuilder_ == null) { @@ -965,14 +932,14 @@ public Builder removeItemList(int index) { return this; } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder( int index) { return getItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index) { @@ -982,7 +949,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL } } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public java.util.List getItemListOrBuilderList() { @@ -993,14 +960,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL } } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() { return getItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder( int index) { @@ -1008,7 +975,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemLi index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 6; + * repeated .ItemParam item_list = 5; */ public java.util.List getItemListBuilderList() { @@ -1028,6 +995,37 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemLi } return itemListBuilder_; } + + private int retcode_ ; + /** + * int32 retcode = 8; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 8; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 8; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1097,8 +1095,8 @@ public emu.grasscutter.net.proto.TakeAchievementGoalRewardRspOuterClass.TakeAchi java.lang.String[] descriptorData = { "\n\"TakeAchievementGoalRewardRsp.proto\032\017It" + "emParam.proto\"_\n\034TakeAchievementGoalRewa" + - "rdRsp\022\017\n\007id_list\030\016 \003(\r\022\017\n\007retcode\030\n \001(\005\022" + - "\035\n\titem_list\030\006 \003(\0132\n.ItemParamB\033\n\031emu.gr" + + "rdRsp\022\017\n\007id_list\030\001 \003(\r\022\035\n\titem_list\030\005 \003(" + + "\0132\n.ItemParam\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.gr" + "asscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1111,7 +1109,7 @@ public emu.grasscutter.net.proto.TakeAchievementGoalRewardRspOuterClass.TakeAchi internal_static_TakeAchievementGoalRewardRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TakeAchievementGoalRewardRsp_descriptor, - new java.lang.String[] { "IdList", "Retcode", "ItemList", }); + new java.lang.String[] { "IdList", "ItemList", "Retcode", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementRewardReqOuterClass.java index 9403bb38b25..f06d272beda 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementRewardReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementRewardReqOuterClass.java @@ -19,17 +19,17 @@ public interface TakeAchievementRewardReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @return A list containing the idList. */ java.util.List getIdListList(); /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @return The count of idList. */ int getIdListCount(); /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @param index The index of the element to return. * @return The idList at the given index. */ @@ -37,8 +37,7 @@ public interface TakeAchievementRewardReqOrBuilder extends } /** * 
-   * CmdId: 20624
-   * Obf: DPBGALMPEBD
+   * CmdId: 24332
    *
* * Protobuf type {@code TakeAchievementRewardReq} @@ -87,7 +86,7 @@ private TakeAchievementRewardReq( case 0: done = true; break; - case 120: { + case 48: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { idList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -95,7 +94,7 @@ private TakeAchievementRewardReq( idList_.addInt(input.readUInt32()); break; } - case 122: { + case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -143,10 +142,10 @@ private TakeAchievementRewardReq( emu.grasscutter.net.proto.TakeAchievementRewardReqOuterClass.TakeAchievementRewardReq.class, emu.grasscutter.net.proto.TakeAchievementRewardReqOuterClass.TakeAchievementRewardReq.Builder.class); } - public static final int ID_LIST_FIELD_NUMBER = 15; + public static final int ID_LIST_FIELD_NUMBER = 6; private com.google.protobuf.Internal.IntList idList_; /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @return A list containing the idList. */ @java.lang.Override @@ -155,14 +154,14 @@ private TakeAchievementRewardReq( return idList_; } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @return The count of idList. */ public int getIdListCount() { return idList_.size(); } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @param index The index of the element to return. * @return The idList at the given index. */ @@ -187,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (getIdListList().size() > 0) { - output.writeUInt32NoTag(122); + output.writeUInt32NoTag(50); output.writeUInt32NoTag(idListMemoizedSerializedSize); } for (int i = 0; i < idList_.size(); i++) { @@ -345,8 +344,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20624
-     * Obf: DPBGALMPEBD
+     * CmdId: 24332
      *
* * Protobuf type {@code TakeAchievementRewardReq} @@ -516,7 +514,7 @@ private void ensureIdListIsMutable() { } } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @return A list containing the idList. */ public java.util.List @@ -525,14 +523,14 @@ private void ensureIdListIsMutable() { java.util.Collections.unmodifiableList(idList_) : idList_; } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @return The count of idList. */ public int getIdListCount() { return idList_.size(); } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @param index The index of the element to return. * @return The idList at the given index. */ @@ -540,7 +538,7 @@ public int getIdList(int index) { return idList_.getInt(index); } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @param index The index to set the value at. * @param value The idList to set. * @return This builder for chaining. @@ -553,7 +551,7 @@ public Builder setIdList( return this; } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @param value The idList to add. * @return This builder for chaining. */ @@ -564,7 +562,7 @@ public Builder addIdList(int value) { return this; } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @param values The idList to add. * @return This builder for chaining. */ @@ -577,7 +575,7 @@ public Builder addAllIdList( return this; } /** - * repeated uint32 id_list = 15; + * repeated uint32 id_list = 6; * @return This builder for chaining. */ public Builder clearIdList() { @@ -654,7 +652,7 @@ public emu.grasscutter.net.proto.TakeAchievementRewardReqOuterClass.TakeAchievem static { java.lang.String[] descriptorData = { "\n\036TakeAchievementRewardReq.proto\"+\n\030Take" + - "AchievementRewardReq\022\017\n\007id_list\030\017 \003(\rB\033\n" + + "AchievementRewardReq\022\017\n\007id_list\030\006 \003(\rB\033\n" + "\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementRewardRspOuterClass.java index 24f74bcbbd4..78a55ccbb64 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementRewardRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeAchievementRewardRspOuterClass.java @@ -19,56 +19,55 @@ public interface TakeAchievementRewardRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .ItemParam item_list = 14; - */ - java.util.List - getItemListList(); - /** - * repeated .ItemParam item_list = 14; - */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index); - /** - * repeated .ItemParam item_list = 14; - */ - int getItemListCount(); - /** - * repeated .ItemParam item_list = 14; - */ - java.util.List - getItemListOrBuilderList(); - /** - * repeated .ItemParam item_list = 14; - */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( - int index); - - /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 5; * @return A list containing the idList. */ java.util.List getIdListList(); /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 5; * @return The count of idList. */ int getIdListCount(); /** - * repeated uint32 id_list = 13; + * repeated uint32 id_list = 5; * @param index The index of the element to return. * @return The idList at the given index. */ int getIdList(int index); /** - * int32 retcode = 2; + * int32 retcode = 7; * @return The retcode. */ int getRetcode(); + + /** + * repeated .ItemParam item_list = 11; + */ + java.util.List + getItemListList(); + /** + * repeated .ItemParam item_list = 11; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index); + /** + * repeated .ItemParam item_list = 11; + */ + int getItemListCount(); + /** + * repeated .ItemParam item_list = 11; + */ + java.util.List + getItemListOrBuilderList(); + /** + * repeated .ItemParam item_list = 11; + */ + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( + int index); } /** * 
-   * CmdId: 23696
-   * Obf: GMEJLKDLEEA
+   * CmdId: 1595
    *
* * Protobuf type {@code TakeAchievementRewardRsp} @@ -83,8 +82,8 @@ private TakeAchievementRewardRsp(com.google.protobuf.GeneratedMessageV3.Builder< super(builder); } private TakeAchievementRewardRsp() { - itemList_ = java.util.Collections.emptyList(); idList_ = emptyIntList(); + itemList_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -118,25 +117,20 @@ private TakeAchievementRewardRsp( case 0: done = true; break; - case 16: { - - retcode_ = input.readInt32(); - break; - } - case 104: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + case 40: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { idList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } idList_.addInt(input.readUInt32()); break; } - case 106: { + case 42: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { idList_ = newIntList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { idList_.addInt(input.readUInt32()); @@ -144,10 +138,15 @@ private TakeAchievementRewardRsp( input.popLimit(limit); break; } - case 114: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { + case 56: { + + retcode_ = input.readInt32(); + break; + } + case 90: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { itemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000002; } itemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); @@ -168,10 +167,10 @@ private TakeAchievementRewardRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { idList_.makeImmutable(); // C } - if (((mutable_bitField0_ & 0x00000001) != 0)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { itemList_ = java.util.Collections.unmodifiableList(itemList_); } this.unknownFields = unknownFields.build(); @@ -191,17 +190,56 @@ private TakeAchievementRewardRsp( emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp.class, emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp.Builder.class); } - public static final int ITEM_LIST_FIELD_NUMBER = 14; + public static final int ID_LIST_FIELD_NUMBER = 5; + private com.google.protobuf.Internal.IntList idList_; + /** + * repeated uint32 id_list = 5; + * @return A list containing the idList. + */ + @java.lang.Override + public java.util.List + getIdListList() { + return idList_; + } + /** + * repeated uint32 id_list = 5; + * @return The count of idList. + */ + public int getIdListCount() { + return idList_.size(); + } + /** + * repeated uint32 id_list = 5; + * @param index The index of the element to return. + * @return The idList at the given index. + */ + public int getIdList(int index) { + return idList_.getInt(index); + } + private int idListMemoizedSerializedSize = -1; + + public static final int RETCODE_FIELD_NUMBER = 7; + private int retcode_; + /** + * int32 retcode = 7; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + + public static final int ITEM_LIST_FIELD_NUMBER = 11; private java.util.List itemList_; /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ @java.lang.Override public java.util.List getItemListList() { return itemList_; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ @java.lang.Override public java.util.List @@ -209,21 +247,21 @@ public java.util.List g return itemList_; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ @java.lang.Override public int getItemListCount() { return itemList_.size(); } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { return itemList_.get(index); } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( @@ -231,45 +269,6 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL return itemList_.get(index); } - public static final int ID_LIST_FIELD_NUMBER = 13; - private com.google.protobuf.Internal.IntList idList_; - /** - * repeated uint32 id_list = 13; - * @return A list containing the idList. - */ - @java.lang.Override - public java.util.List - getIdListList() { - return idList_; - } - /** - * repeated uint32 id_list = 13; - * @return The count of idList. - */ - public int getIdListCount() { - return idList_.size(); - } - /** - * repeated uint32 id_list = 13; - * @param index The index of the element to return. - * @return The idList at the given index. - */ - public int getIdList(int index) { - return idList_.getInt(index); - } - private int idListMemoizedSerializedSize = -1; - - public static final int RETCODE_FIELD_NUMBER = 2; - private int retcode_; - /** - * int32 retcode = 2; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -285,18 +284,18 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (retcode_ != 0) { - output.writeInt32(2, retcode_); - } if (getIdListList().size() > 0) { - output.writeUInt32NoTag(106); + output.writeUInt32NoTag(42); output.writeUInt32NoTag(idListMemoizedSerializedSize); } for (int i = 0; i < idList_.size(); i++) { output.writeUInt32NoTag(idList_.getInt(i)); } + if (retcode_ != 0) { + output.writeInt32(7, retcode_); + } for (int i = 0; i < itemList_.size(); i++) { - output.writeMessage(14, itemList_.get(i)); + output.writeMessage(11, itemList_.get(i)); } unknownFields.writeTo(output); } @@ -307,10 +306,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, retcode_); - } { int dataSize = 0; for (int i = 0; i < idList_.size(); i++) { @@ -325,9 +320,13 @@ public int getSerializedSize() { } idListMemoizedSerializedSize = dataSize; } + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(7, retcode_); + } for (int i = 0; i < itemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, itemList_.get(i)); + .computeMessageSize(11, itemList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -344,12 +343,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp other = (emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp) obj; - if (!getItemListList() - .equals(other.getItemListList())) return false; if (!getIdListList() .equals(other.getIdListList())) return false; if (getRetcode() != other.getRetcode()) return false; + if (!getItemListList() + .equals(other.getItemListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -361,16 +360,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getItemListCount() > 0) { - hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getItemListList().hashCode(); - } if (getIdListCount() > 0) { hash = (37 * hash) + ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getIdListList().hashCode(); } hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); + if (getItemListCount() > 0) { + hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER; + hash = (53 * hash) + getItemListList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -468,8 +467,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23696
-     * Obf: GMEJLKDLEEA
+     * CmdId: 1595
      *
* * Protobuf type {@code TakeAchievementRewardRsp} @@ -510,16 +508,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + idList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + retcode_ = 0; + if (itemListBuilder_ == null) { itemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { itemListBuilder_.clear(); } - idList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); - retcode_ = 0; - return this; } @@ -547,21 +545,21 @@ public emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievem public emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp buildPartial() { emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp result = new emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp(this); int from_bitField0_ = bitField0_; + if (((bitField0_ & 0x00000001) != 0)) { + idList_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.idList_ = idList_; + result.retcode_ = retcode_; if (itemListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { itemList_ = java.util.Collections.unmodifiableList(itemList_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.itemList_ = itemList_; } else { result.itemList_ = itemListBuilder_.build(); } - if (((bitField0_ & 0x00000002) != 0)) { - idList_.makeImmutable(); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.idList_ = idList_; - result.retcode_ = retcode_; onBuilt(); return result; } @@ -610,11 +608,24 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp other) { if (other == emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievementRewardRsp.getDefaultInstance()) return this; + if (!other.idList_.isEmpty()) { + if (idList_.isEmpty()) { + idList_ = other.idList_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureIdListIsMutable(); + idList_.addAll(other.idList_); + } + onChanged(); + } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } if (itemListBuilder_ == null) { if (!other.itemList_.isEmpty()) { if (itemList_.isEmpty()) { itemList_ = other.itemList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureItemListIsMutable(); itemList_.addAll(other.itemList_); @@ -627,7 +638,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeAchievementRewardRspOuter itemListBuilder_.dispose(); itemListBuilder_ = null; itemList_ = other.itemList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); itemListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getItemListFieldBuilder() : null; @@ -636,19 +647,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeAchievementRewardRspOuter } } } - if (!other.idList_.isEmpty()) { - if (idList_.isEmpty()) { - idList_ = other.idList_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureIdListIsMutable(); - idList_.addAll(other.idList_); - } - onChanged(); - } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -679,12 +677,122 @@ public Builder mergeFrom( } private int bitField0_; + private com.google.protobuf.Internal.IntList idList_ = emptyIntList(); + private void ensureIdListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + idList_ = mutableCopy(idList_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated uint32 id_list = 5; + * @return A list containing the idList. + */ + public java.util.List + getIdListList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(idList_) : idList_; + } + /** + * repeated uint32 id_list = 5; + * @return The count of idList. + */ + public int getIdListCount() { + return idList_.size(); + } + /** + * repeated uint32 id_list = 5; + * @param index The index of the element to return. + * @return The idList at the given index. + */ + public int getIdList(int index) { + return idList_.getInt(index); + } + /** + * repeated uint32 id_list = 5; + * @param index The index to set the value at. + * @param value The idList to set. + * @return This builder for chaining. + */ + public Builder setIdList( + int index, int value) { + ensureIdListIsMutable(); + idList_.setInt(index, value); + onChanged(); + return this; + } + /** + * repeated uint32 id_list = 5; + * @param value The idList to add. + * @return This builder for chaining. + */ + public Builder addIdList(int value) { + ensureIdListIsMutable(); + idList_.addInt(value); + onChanged(); + return this; + } + /** + * repeated uint32 id_list = 5; + * @param values The idList to add. + * @return This builder for chaining. + */ + public Builder addAllIdList( + java.lang.Iterable values) { + ensureIdListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, idList_); + onChanged(); + return this; + } + /** + * repeated uint32 id_list = 5; + * @return This builder for chaining. + */ + public Builder clearIdList() { + idList_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 7; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 7; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 7; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; + onChanged(); + return this; + } + private java.util.List itemList_ = java.util.Collections.emptyList(); private void ensureItemListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { itemList_ = new java.util.ArrayList(itemList_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -692,7 +800,7 @@ private void ensureItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_; /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public java.util.List getItemListList() { if (itemListBuilder_ == null) { @@ -702,7 +810,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public int getItemListCount() { if (itemListBuilder_ == null) { @@ -712,7 +820,7 @@ public int getItemListCount() { } } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { if (itemListBuilder_ == null) { @@ -722,7 +830,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int i } } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -739,7 +847,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -753,7 +861,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemListBuilder_ == null) { @@ -769,7 +877,7 @@ public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemPar return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -786,7 +894,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder addItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -800,7 +908,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -814,7 +922,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder addAllItemList( java.lang.Iterable values) { @@ -829,12 +937,12 @@ public Builder addAllItemList( return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder clearItemList() { if (itemListBuilder_ == null) { itemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { itemListBuilder_.clear(); @@ -842,7 +950,7 @@ public Builder clearItemList() { return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public Builder removeItemList(int index) { if (itemListBuilder_ == null) { @@ -855,14 +963,14 @@ public Builder removeItemList(int index) { return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder( int index) { return getItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index) { @@ -872,7 +980,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL } } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public java.util.List getItemListOrBuilderList() { @@ -883,14 +991,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL } } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() { return getItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder( int index) { @@ -898,7 +1006,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemLi index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 14; + * repeated .ItemParam item_list = 11; */ public java.util.List getItemListBuilderList() { @@ -911,123 +1019,13 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemLi itemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( itemList_, - ((bitField0_ & 0x00000001) != 0), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); itemList_ = null; } return itemListBuilder_; } - - private com.google.protobuf.Internal.IntList idList_ = emptyIntList(); - private void ensureIdListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - idList_ = mutableCopy(idList_); - bitField0_ |= 0x00000002; - } - } - /** - * repeated uint32 id_list = 13; - * @return A list containing the idList. - */ - public java.util.List - getIdListList() { - return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(idList_) : idList_; - } - /** - * repeated uint32 id_list = 13; - * @return The count of idList. - */ - public int getIdListCount() { - return idList_.size(); - } - /** - * repeated uint32 id_list = 13; - * @param index The index of the element to return. - * @return The idList at the given index. - */ - public int getIdList(int index) { - return idList_.getInt(index); - } - /** - * repeated uint32 id_list = 13; - * @param index The index to set the value at. - * @param value The idList to set. - * @return This builder for chaining. - */ - public Builder setIdList( - int index, int value) { - ensureIdListIsMutable(); - idList_.setInt(index, value); - onChanged(); - return this; - } - /** - * repeated uint32 id_list = 13; - * @param value The idList to add. - * @return This builder for chaining. - */ - public Builder addIdList(int value) { - ensureIdListIsMutable(); - idList_.addInt(value); - onChanged(); - return this; - } - /** - * repeated uint32 id_list = 13; - * @param values The idList to add. - * @return This builder for chaining. - */ - public Builder addAllIdList( - java.lang.Iterable values) { - ensureIdListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, idList_); - onChanged(); - return this; - } - /** - * repeated uint32 id_list = 13; - * @return This builder for chaining. - */ - public Builder clearIdList() { - idList_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000002); - onChanged(); - return this; - } - - private int retcode_ ; - /** - * int32 retcode = 2; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 2; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 2; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1096,9 +1094,9 @@ public emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievem static { java.lang.String[] descriptorData = { "\n\036TakeAchievementRewardRsp.proto\032\017ItemPa" + - "ram.proto\"[\n\030TakeAchievementRewardRsp\022\035\n" + - "\titem_list\030\016 \003(\0132\n.ItemParam\022\017\n\007id_list\030" + - "\r \003(\r\022\017\n\007retcode\030\002 \001(\005B\033\n\031emu.grasscutte" + + "ram.proto\"[\n\030TakeAchievementRewardRsp\022\017\n" + + "\007id_list\030\005 \003(\r\022\017\n\007retcode\030\007 \001(\005\022\035\n\titem_" + + "list\030\013 \003(\0132\n.ItemParamB\033\n\031emu.grasscutte" + "r.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1111,7 +1109,7 @@ public emu.grasscutter.net.proto.TakeAchievementRewardRspOuterClass.TakeAchievem internal_static_TakeAchievementRewardRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TakeAchievementRewardRsp_descriptor, - new java.lang.String[] { "ItemList", "IdList", "Retcode", }); + new java.lang.String[] { "IdList", "Retcode", "ItemList", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassMissionPointReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassMissionPointReqOuterClass.java index 1a3e586a3bd..63690d25eae 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassMissionPointReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassMissionPointReqOuterClass.java @@ -19,17 +19,17 @@ public interface TakeBattlePassMissionPointReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @return A list containing the missionIdList. */ java.util.List getMissionIdListList(); /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @return The count of missionIdList. */ int getMissionIdListCount(); /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @param index The index of the element to return. * @return The missionIdList at the given index. */ @@ -37,8 +37,8 @@ public interface TakeBattlePassMissionPointReqOrBuilder extends } /** * 
-   * CmdId: 20580
-   * Obf: GPPAPCLMIEA
+   * CmdId: 6231
+   * obf: KOIKEKNGKOD
    *
* * Protobuf type {@code TakeBattlePassMissionPointReq} @@ -87,7 +87,7 @@ private TakeBattlePassMissionPointReq( case 0: done = true; break; - case 40: { + case 80: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { missionIdList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -95,7 +95,7 @@ private TakeBattlePassMissionPointReq( missionIdList_.addInt(input.readUInt32()); break; } - case 42: { + case 82: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -143,10 +143,10 @@ private TakeBattlePassMissionPointReq( emu.grasscutter.net.proto.TakeBattlePassMissionPointReqOuterClass.TakeBattlePassMissionPointReq.class, emu.grasscutter.net.proto.TakeBattlePassMissionPointReqOuterClass.TakeBattlePassMissionPointReq.Builder.class); } - public static final int MISSION_ID_LIST_FIELD_NUMBER = 5; + public static final int MISSION_ID_LIST_FIELD_NUMBER = 10; private com.google.protobuf.Internal.IntList missionIdList_; /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @return A list containing the missionIdList. */ @java.lang.Override @@ -155,14 +155,14 @@ private TakeBattlePassMissionPointReq( return missionIdList_; } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @return The count of missionIdList. */ public int getMissionIdListCount() { return missionIdList_.size(); } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @param index The index of the element to return. * @return The missionIdList at the given index. */ @@ -187,7 +187,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (getMissionIdListList().size() > 0) { - output.writeUInt32NoTag(42); + output.writeUInt32NoTag(82); output.writeUInt32NoTag(missionIdListMemoizedSerializedSize); } for (int i = 0; i < missionIdList_.size(); i++) { @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 20580
-     * Obf: GPPAPCLMIEA
+     * CmdId: 6231
+     * obf: KOIKEKNGKOD
      *
* * Protobuf type {@code TakeBattlePassMissionPointReq} @@ -516,7 +516,7 @@ private void ensureMissionIdListIsMutable() { } } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @return A list containing the missionIdList. */ public java.util.List @@ -525,14 +525,14 @@ private void ensureMissionIdListIsMutable() { java.util.Collections.unmodifiableList(missionIdList_) : missionIdList_; } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @return The count of missionIdList. */ public int getMissionIdListCount() { return missionIdList_.size(); } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @param index The index of the element to return. * @return The missionIdList at the given index. */ @@ -540,7 +540,7 @@ public int getMissionIdList(int index) { return missionIdList_.getInt(index); } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @param index The index to set the value at. * @param value The missionIdList to set. * @return This builder for chaining. @@ -553,7 +553,7 @@ public Builder setMissionIdList( return this; } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @param value The missionIdList to add. * @return This builder for chaining. */ @@ -564,7 +564,7 @@ public Builder addMissionIdList(int value) { return this; } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @param values The missionIdList to add. * @return This builder for chaining. */ @@ -577,7 +577,7 @@ public Builder addAllMissionIdList( return this; } /** - * repeated uint32 mission_id_list = 5; + * repeated uint32 mission_id_list = 10; * @return This builder for chaining. */ public Builder clearMissionIdList() { @@ -655,7 +655,7 @@ public emu.grasscutter.net.proto.TakeBattlePassMissionPointReqOuterClass.TakeBat java.lang.String[] descriptorData = { "\n#TakeBattlePassMissionPointReq.proto\"8\n" + "\035TakeBattlePassMissionPointReq\022\027\n\017missio" + - "n_id_list\030\005 \003(\rB\033\n\031emu.grasscutter.net.p" + + "n_id_list\030\n \003(\rB\033\n\031emu.grasscutter.net.p" + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassRewardReqOuterClass.java index f6f4148540c..18831e6f135 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassRewardReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassRewardReqOuterClass.java @@ -19,33 +19,33 @@ public interface TakeBattlePassRewardReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ java.util.List getTakeOptionListList(); /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index); /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ int getTakeOptionListCount(); /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ java.util.List getTakeOptionListOrBuilderList(); /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( int index); } /** * 
-   * CmdId: 28914
-   * Obf: AEFJDMJIPGE
+   * CmdId: 29828
+   * obf: OMMFIGKBKOO
    *
* * Protobuf type {@code TakeBattlePassRewardReq} @@ -94,7 +94,7 @@ private TakeBattlePassRewardReq( case 0: done = true; break; - case 18: { + case 114: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { takeOptionList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -138,17 +138,17 @@ private TakeBattlePassRewardReq( emu.grasscutter.net.proto.TakeBattlePassRewardReqOuterClass.TakeBattlePassRewardReq.class, emu.grasscutter.net.proto.TakeBattlePassRewardReqOuterClass.TakeBattlePassRewardReq.Builder.class); } - public static final int TAKE_OPTION_LIST_FIELD_NUMBER = 2; + public static final int TAKE_OPTION_LIST_FIELD_NUMBER = 14; private java.util.List takeOptionList_; /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ @java.lang.Override public java.util.List getTakeOptionListList() { return takeOptionList_; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ @java.lang.Override public java.util.List @@ -156,21 +156,21 @@ public java.util.Listrepeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ @java.lang.Override public int getTakeOptionListCount() { return takeOptionList_.size(); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ @java.lang.Override public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index) { return takeOptionList_.get(index); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ @java.lang.Override public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( @@ -193,7 +193,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < takeOptionList_.size(); i++) { - output.writeMessage(2, takeOptionList_.get(i)); + output.writeMessage(14, takeOptionList_.get(i)); } unknownFields.writeTo(output); } @@ -206,7 +206,7 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < takeOptionList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, takeOptionList_.get(i)); + .computeMessageSize(14, takeOptionList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -337,8 +337,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28914
-     * Obf: AEFJDMJIPGE
+     * CmdId: 29828
+     * obf: OMMFIGKBKOO
      *
* * Protobuf type {@code TakeBattlePassRewardReq} @@ -538,7 +538,7 @@ private void ensureTakeOptionListIsMutable() { emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder> takeOptionListBuilder_; /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public java.util.List getTakeOptionListList() { if (takeOptionListBuilder_ == null) { @@ -548,7 +548,7 @@ public java.util.Listrepeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public int getTakeOptionListCount() { if (takeOptionListBuilder_ == null) { @@ -558,7 +558,7 @@ public int getTakeOptionListCount() { } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index) { if (takeOptionListBuilder_ == null) { @@ -568,7 +568,7 @@ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder setTakeOptionList( int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { @@ -585,7 +585,7 @@ public Builder setTakeOptionList( return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder setTakeOptionList( int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { @@ -599,7 +599,7 @@ public Builder setTakeOptionList( return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder addTakeOptionList(emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { if (takeOptionListBuilder_ == null) { @@ -615,7 +615,7 @@ public Builder addTakeOptionList(emu.grasscutter.net.proto.BattlePassRewardTakeO return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder addTakeOptionList( int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { @@ -632,7 +632,7 @@ public Builder addTakeOptionList( return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder addTakeOptionList( emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { @@ -646,7 +646,7 @@ public Builder addTakeOptionList( return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder addTakeOptionList( int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { @@ -660,7 +660,7 @@ public Builder addTakeOptionList( return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder addAllTakeOptionList( java.lang.Iterable values) { @@ -675,7 +675,7 @@ public Builder addAllTakeOptionList( return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder clearTakeOptionList() { if (takeOptionListBuilder_ == null) { @@ -688,7 +688,7 @@ public Builder clearTakeOptionList() { return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public Builder removeTakeOptionList(int index) { if (takeOptionListBuilder_ == null) { @@ -701,14 +701,14 @@ public Builder removeTakeOptionList(int index) { return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder getTakeOptionListBuilder( int index) { return getTakeOptionListFieldBuilder().getBuilder(index); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( int index) { @@ -718,7 +718,7 @@ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public java.util.List getTakeOptionListOrBuilderList() { @@ -729,14 +729,14 @@ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder addTakeOptionListBuilder() { return getTakeOptionListFieldBuilder().addBuilder( emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.getDefaultInstance()); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder addTakeOptionListBuilder( int index) { @@ -744,7 +744,7 @@ public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.getDefaultInstance()); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 2; + * repeated .BattlePassRewardTakeOption take_option_list = 14; */ public java.util.List getTakeOptionListBuilderList() { @@ -833,7 +833,7 @@ public emu.grasscutter.net.proto.TakeBattlePassRewardReqOuterClass.TakeBattlePas java.lang.String[] descriptorData = { "\n\035TakeBattlePassRewardReq.proto\032 BattleP" + "assRewardTakeOption.proto\"P\n\027TakeBattleP" + - "assRewardReq\0225\n\020take_option_list\030\002 \003(\0132\033" + + "assRewardReq\0225\n\020take_option_list\030\016 \003(\0132\033" + ".BattlePassRewardTakeOptionB\033\n\031emu.grass" + "cutter.net.protob\006proto3" }; diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassRewardRspOuterClass.java index 87ed1ecc477..7ab44e97e1d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassRewardRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassRewardRspOuterClass.java @@ -19,63 +19,63 @@ public interface TakeBattlePassRewardRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 12; + * int32 retcode = 1; * @return The retcode. */ int getRetcode(); /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - java.util.List - getTakeOptionListList(); + java.util.List + getItemListList(); /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index); + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index); /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - int getTakeOptionListCount(); + int getItemListCount(); /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - java.util.List - getTakeOptionListOrBuilderList(); + java.util.List + getItemListOrBuilderList(); /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index); /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - java.util.List - getItemListList(); + java.util.List + getTakeOptionListList(); /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index); + emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index); /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - int getItemListCount(); + int getTakeOptionListCount(); /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - java.util.List - getItemListOrBuilderList(); + java.util.List + getTakeOptionListOrBuilderList(); /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( + emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( int index); } /** * 
-   * CmdId: 25609
-   * Obf: JPNLFJHCEII
+   * CmdId: 941
+   * obf: DFNILPBBKPI
    *
* * Protobuf type {@code TakeBattlePassRewardRsp} @@ -90,8 +90,8 @@ private TakeBattlePassRewardRsp(com.google.protobuf.GeneratedMessageV3.Builder(); - mutable_bitField0_ |= 0x00000001; - } - takeOptionList_.add( - input.readMessage(emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.parser(), extensionRegistry)); - break; - } - case 96: { + case 8: { retcode_ = input.readInt32(); break; } - case 114: { - if (!((mutable_bitField0_ & 0x00000002) != 0)) { + case 50: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { itemList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000001; } itemList_.add( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } + case 106: { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + takeOptionList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + takeOptionList_.add( + input.readMessage(emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.parser(), extensionRegistry)); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -164,10 +164,10 @@ private TakeBattlePassRewardRsp( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - takeOptionList_ = java.util.Collections.unmodifiableList(takeOptionList_); + itemList_ = java.util.Collections.unmodifiableList(itemList_); } if (((mutable_bitField0_ & 0x00000002) != 0)) { - itemList_ = java.util.Collections.unmodifiableList(itemList_); + takeOptionList_ = java.util.Collections.unmodifiableList(takeOptionList_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -186,10 +186,10 @@ private TakeBattlePassRewardRsp( emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterClass.TakeBattlePassRewardRsp.class, emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterClass.TakeBattlePassRewardRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 12; + public static final int RETCODE_FIELD_NUMBER = 1; private int retcode_; /** - * int32 retcode = 12; + * int32 retcode = 1; * @return The retcode. */ @java.lang.Override @@ -197,84 +197,84 @@ public int getRetcode() { return retcode_; } - public static final int TAKE_OPTION_LIST_FIELD_NUMBER = 4; - private java.util.List takeOptionList_; + public static final int ITEM_LIST_FIELD_NUMBER = 6; + private java.util.List itemList_; /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ @java.lang.Override - public java.util.List getTakeOptionListList() { - return takeOptionList_; + public java.util.List getItemListList() { + return itemList_; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ @java.lang.Override - public java.util.List - getTakeOptionListOrBuilderList() { - return takeOptionList_; + public java.util.List + getItemListOrBuilderList() { + return itemList_; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ @java.lang.Override - public int getTakeOptionListCount() { - return takeOptionList_.size(); + public int getItemListCount() { + return itemList_.size(); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ @java.lang.Override - public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index) { - return takeOptionList_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { + return itemList_.get(index); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ @java.lang.Override - public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index) { - return takeOptionList_.get(index); + return itemList_.get(index); } - public static final int ITEM_LIST_FIELD_NUMBER = 14; - private java.util.List itemList_; + public static final int TAKE_OPTION_LIST_FIELD_NUMBER = 13; + private java.util.List takeOptionList_; /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ @java.lang.Override - public java.util.List getItemListList() { - return itemList_; + public java.util.List getTakeOptionListList() { + return takeOptionList_; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ @java.lang.Override - public java.util.List - getItemListOrBuilderList() { - return itemList_; + public java.util.List + getTakeOptionListOrBuilderList() { + return takeOptionList_; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ @java.lang.Override - public int getItemListCount() { - return itemList_.size(); + public int getTakeOptionListCount() { + return takeOptionList_.size(); } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { - return itemList_.get(index); + public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index) { + return takeOptionList_.get(index); } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ @java.lang.Override - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( + public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( int index) { - return itemList_.get(index); + return takeOptionList_.get(index); } private byte memoizedIsInitialized = -1; @@ -291,14 +291,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < takeOptionList_.size(); i++) { - output.writeMessage(4, takeOptionList_.get(i)); - } if (retcode_ != 0) { - output.writeInt32(12, retcode_); + output.writeInt32(1, retcode_); } for (int i = 0; i < itemList_.size(); i++) { - output.writeMessage(14, itemList_.get(i)); + output.writeMessage(6, itemList_.get(i)); + } + for (int i = 0; i < takeOptionList_.size(); i++) { + output.writeMessage(13, takeOptionList_.get(i)); } unknownFields.writeTo(output); } @@ -309,17 +309,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < takeOptionList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, takeOptionList_.get(i)); - } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(12, retcode_); + .computeInt32Size(1, retcode_); } for (int i = 0; i < itemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, itemList_.get(i)); + .computeMessageSize(6, itemList_.get(i)); + } + for (int i = 0; i < takeOptionList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(13, takeOptionList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -338,10 +338,10 @@ public boolean equals(final java.lang.Object obj) { if (getRetcode() != other.getRetcode()) return false; - if (!getTakeOptionListList() - .equals(other.getTakeOptionListList())) return false; if (!getItemListList() .equals(other.getItemListList())) return false; + if (!getTakeOptionListList() + .equals(other.getTakeOptionListList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -355,14 +355,14 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - if (getTakeOptionListCount() > 0) { - hash = (37 * hash) + TAKE_OPTION_LIST_FIELD_NUMBER; - hash = (53 * hash) + getTakeOptionListList().hashCode(); - } if (getItemListCount() > 0) { hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getItemListList().hashCode(); } + if (getTakeOptionListCount() > 0) { + hash = (37 * hash) + TAKE_OPTION_LIST_FIELD_NUMBER; + hash = (53 * hash) + getTakeOptionListList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -460,8 +460,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 25609
-     * Obf: JPNLFJHCEII
+     * CmdId: 941
+     * obf: DFNILPBBKPI
      *
* * Protobuf type {@code TakeBattlePassRewardRsp} @@ -496,8 +496,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getTakeOptionListFieldBuilder(); getItemListFieldBuilder(); + getTakeOptionListFieldBuilder(); } } @java.lang.Override @@ -505,17 +505,17 @@ public Builder clear() { super.clear(); retcode_ = 0; - if (takeOptionListBuilder_ == null) { - takeOptionList_ = java.util.Collections.emptyList(); + if (itemListBuilder_ == null) { + itemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { - takeOptionListBuilder_.clear(); + itemListBuilder_.clear(); } - if (itemListBuilder_ == null) { - itemList_ = java.util.Collections.emptyList(); + if (takeOptionListBuilder_ == null) { + takeOptionList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); } else { - itemListBuilder_.clear(); + takeOptionListBuilder_.clear(); } return this; } @@ -545,23 +545,23 @@ public emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterClass.TakeBattlePas emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterClass.TakeBattlePassRewardRsp result = new emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterClass.TakeBattlePassRewardRsp(this); int from_bitField0_ = bitField0_; result.retcode_ = retcode_; - if (takeOptionListBuilder_ == null) { + if (itemListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { - takeOptionList_ = java.util.Collections.unmodifiableList(takeOptionList_); + itemList_ = java.util.Collections.unmodifiableList(itemList_); bitField0_ = (bitField0_ & ~0x00000001); } - result.takeOptionList_ = takeOptionList_; + result.itemList_ = itemList_; } else { - result.takeOptionList_ = takeOptionListBuilder_.build(); + result.itemList_ = itemListBuilder_.build(); } - if (itemListBuilder_ == null) { + if (takeOptionListBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0)) { - itemList_ = java.util.Collections.unmodifiableList(itemList_); + takeOptionList_ = java.util.Collections.unmodifiableList(takeOptionList_); bitField0_ = (bitField0_ & ~0x00000002); } - result.itemList_ = itemList_; + result.takeOptionList_ = takeOptionList_; } else { - result.itemList_ = itemListBuilder_.build(); + result.takeOptionList_ = takeOptionListBuilder_.build(); } onBuilt(); return result; @@ -614,37 +614,11 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterC if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } - if (takeOptionListBuilder_ == null) { - if (!other.takeOptionList_.isEmpty()) { - if (takeOptionList_.isEmpty()) { - takeOptionList_ = other.takeOptionList_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureTakeOptionListIsMutable(); - takeOptionList_.addAll(other.takeOptionList_); - } - onChanged(); - } - } else { - if (!other.takeOptionList_.isEmpty()) { - if (takeOptionListBuilder_.isEmpty()) { - takeOptionListBuilder_.dispose(); - takeOptionListBuilder_ = null; - takeOptionList_ = other.takeOptionList_; - bitField0_ = (bitField0_ & ~0x00000001); - takeOptionListBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getTakeOptionListFieldBuilder() : null; - } else { - takeOptionListBuilder_.addAllMessages(other.takeOptionList_); - } - } - } if (itemListBuilder_ == null) { if (!other.itemList_.isEmpty()) { if (itemList_.isEmpty()) { itemList_ = other.itemList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensureItemListIsMutable(); itemList_.addAll(other.itemList_); @@ -657,7 +631,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterC itemListBuilder_.dispose(); itemListBuilder_ = null; itemList_ = other.itemList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); itemListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getItemListFieldBuilder() : null; @@ -666,6 +640,32 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterC } } } + if (takeOptionListBuilder_ == null) { + if (!other.takeOptionList_.isEmpty()) { + if (takeOptionList_.isEmpty()) { + takeOptionList_ = other.takeOptionList_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureTakeOptionListIsMutable(); + takeOptionList_.addAll(other.takeOptionList_); + } + onChanged(); + } + } else { + if (!other.takeOptionList_.isEmpty()) { + if (takeOptionListBuilder_.isEmpty()) { + takeOptionListBuilder_.dispose(); + takeOptionListBuilder_ = null; + takeOptionList_ = other.takeOptionList_; + bitField0_ = (bitField0_ & ~0x00000002); + takeOptionListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getTakeOptionListFieldBuilder() : null; + } else { + takeOptionListBuilder_.addAllMessages(other.takeOptionList_); + } + } + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -698,7 +698,7 @@ public Builder mergeFrom( private int retcode_ ; /** - * int32 retcode = 12; + * int32 retcode = 1; * @return The retcode. */ @java.lang.Override @@ -706,7 +706,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 12; + * int32 retcode = 1; * @param value The retcode to set. * @return This builder for chaining. */ @@ -717,7 +717,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 12; + * int32 retcode = 1; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -727,484 +727,484 @@ public Builder clearRetcode() { return this; } - private java.util.List takeOptionList_ = + private java.util.List itemList_ = java.util.Collections.emptyList(); - private void ensureTakeOptionListIsMutable() { + private void ensureItemListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - takeOptionList_ = new java.util.ArrayList(takeOptionList_); + itemList_ = new java.util.ArrayList(itemList_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder> takeOptionListBuilder_; + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_; /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public java.util.List getTakeOptionListList() { - if (takeOptionListBuilder_ == null) { - return java.util.Collections.unmodifiableList(takeOptionList_); + public java.util.List getItemListList() { + if (itemListBuilder_ == null) { + return java.util.Collections.unmodifiableList(itemList_); } else { - return takeOptionListBuilder_.getMessageList(); + return itemListBuilder_.getMessageList(); } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public int getTakeOptionListCount() { - if (takeOptionListBuilder_ == null) { - return takeOptionList_.size(); + public int getItemListCount() { + if (itemListBuilder_ == null) { + return itemList_.size(); } else { - return takeOptionListBuilder_.getCount(); + return itemListBuilder_.getCount(); } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index) { - if (takeOptionListBuilder_ == null) { - return takeOptionList_.get(index); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { + if (itemListBuilder_ == null) { + return itemList_.get(index); } else { - return takeOptionListBuilder_.getMessage(index); + return itemListBuilder_.getMessage(index); } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder setTakeOptionList( - int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { - if (takeOptionListBuilder_ == null) { + public Builder setItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (itemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureTakeOptionListIsMutable(); - takeOptionList_.set(index, value); + ensureItemListIsMutable(); + itemList_.set(index, value); onChanged(); } else { - takeOptionListBuilder_.setMessage(index, value); + itemListBuilder_.setMessage(index, value); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder setTakeOptionList( - int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { - if (takeOptionListBuilder_ == null) { - ensureTakeOptionListIsMutable(); - takeOptionList_.set(index, builderForValue.build()); + public Builder setItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (itemListBuilder_ == null) { + ensureItemListIsMutable(); + itemList_.set(index, builderForValue.build()); onChanged(); } else { - takeOptionListBuilder_.setMessage(index, builderForValue.build()); + itemListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder addTakeOptionList(emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { - if (takeOptionListBuilder_ == null) { + public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (itemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureTakeOptionListIsMutable(); - takeOptionList_.add(value); + ensureItemListIsMutable(); + itemList_.add(value); onChanged(); } else { - takeOptionListBuilder_.addMessage(value); + itemListBuilder_.addMessage(value); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder addTakeOptionList( - int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { - if (takeOptionListBuilder_ == null) { + public Builder addItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { + if (itemListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureTakeOptionListIsMutable(); - takeOptionList_.add(index, value); + ensureItemListIsMutable(); + itemList_.add(index, value); onChanged(); } else { - takeOptionListBuilder_.addMessage(index, value); + itemListBuilder_.addMessage(index, value); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder addTakeOptionList( - emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { - if (takeOptionListBuilder_ == null) { - ensureTakeOptionListIsMutable(); - takeOptionList_.add(builderForValue.build()); + public Builder addItemList( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (itemListBuilder_ == null) { + ensureItemListIsMutable(); + itemList_.add(builderForValue.build()); onChanged(); } else { - takeOptionListBuilder_.addMessage(builderForValue.build()); + itemListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder addTakeOptionList( - int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { - if (takeOptionListBuilder_ == null) { - ensureTakeOptionListIsMutable(); - takeOptionList_.add(index, builderForValue.build()); + public Builder addItemList( + int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { + if (itemListBuilder_ == null) { + ensureItemListIsMutable(); + itemList_.add(index, builderForValue.build()); onChanged(); } else { - takeOptionListBuilder_.addMessage(index, builderForValue.build()); + itemListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder addAllTakeOptionList( - java.lang.Iterable values) { - if (takeOptionListBuilder_ == null) { - ensureTakeOptionListIsMutable(); + public Builder addAllItemList( + java.lang.Iterable values) { + if (itemListBuilder_ == null) { + ensureItemListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, takeOptionList_); + values, itemList_); onChanged(); } else { - takeOptionListBuilder_.addAllMessages(values); + itemListBuilder_.addAllMessages(values); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder clearTakeOptionList() { - if (takeOptionListBuilder_ == null) { - takeOptionList_ = java.util.Collections.emptyList(); + public Builder clearItemList() { + if (itemListBuilder_ == null) { + itemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - takeOptionListBuilder_.clear(); + itemListBuilder_.clear(); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public Builder removeTakeOptionList(int index) { - if (takeOptionListBuilder_ == null) { - ensureTakeOptionListIsMutable(); - takeOptionList_.remove(index); + public Builder removeItemList(int index) { + if (itemListBuilder_ == null) { + ensureItemListIsMutable(); + itemList_.remove(index); onChanged(); } else { - takeOptionListBuilder_.remove(index); + itemListBuilder_.remove(index); } return this; } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder getTakeOptionListBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder( int index) { - return getTakeOptionListFieldBuilder().getBuilder(index); + return getItemListFieldBuilder().getBuilder(index); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index) { - if (takeOptionListBuilder_ == null) { - return takeOptionList_.get(index); } else { - return takeOptionListBuilder_.getMessageOrBuilder(index); + if (itemListBuilder_ == null) { + return itemList_.get(index); } else { + return itemListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public java.util.List - getTakeOptionListOrBuilderList() { - if (takeOptionListBuilder_ != null) { - return takeOptionListBuilder_.getMessageOrBuilderList(); + public java.util.List + getItemListOrBuilderList() { + if (itemListBuilder_ != null) { + return itemListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(takeOptionList_); + return java.util.Collections.unmodifiableList(itemList_); } } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder addTakeOptionListBuilder() { - return getTakeOptionListFieldBuilder().addBuilder( - emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.getDefaultInstance()); + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() { + return getItemListFieldBuilder().addBuilder( + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder addTakeOptionListBuilder( + public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder( int index) { - return getTakeOptionListFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.getDefaultInstance()); + return getItemListFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .BattlePassRewardTakeOption take_option_list = 4; + * repeated .ItemParam item_list = 6; */ - public java.util.List - getTakeOptionListBuilderList() { - return getTakeOptionListFieldBuilder().getBuilderList(); + public java.util.List + getItemListBuilderList() { + return getItemListFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder> - getTakeOptionListFieldBuilder() { - if (takeOptionListBuilder_ == null) { - takeOptionListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder>( - takeOptionList_, + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> + getItemListFieldBuilder() { + if (itemListBuilder_ == null) { + itemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( + itemList_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - takeOptionList_ = null; + itemList_ = null; } - return takeOptionListBuilder_; + return itemListBuilder_; } - private java.util.List itemList_ = + private java.util.List takeOptionList_ = java.util.Collections.emptyList(); - private void ensureItemListIsMutable() { + private void ensureTakeOptionListIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { - itemList_ = new java.util.ArrayList(itemList_); + takeOptionList_ = new java.util.ArrayList(takeOptionList_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_; + emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder> takeOptionListBuilder_; /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public java.util.List getItemListList() { - if (itemListBuilder_ == null) { - return java.util.Collections.unmodifiableList(itemList_); + public java.util.List getTakeOptionListList() { + if (takeOptionListBuilder_ == null) { + return java.util.Collections.unmodifiableList(takeOptionList_); } else { - return itemListBuilder_.getMessageList(); + return takeOptionListBuilder_.getMessageList(); } } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public int getItemListCount() { - if (itemListBuilder_ == null) { - return itemList_.size(); + public int getTakeOptionListCount() { + if (takeOptionListBuilder_ == null) { + return takeOptionList_.size(); } else { - return itemListBuilder_.getCount(); + return takeOptionListBuilder_.getCount(); } } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { - if (itemListBuilder_ == null) { - return itemList_.get(index); + public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption getTakeOptionList(int index) { + if (takeOptionListBuilder_ == null) { + return takeOptionList_.get(index); } else { - return itemListBuilder_.getMessage(index); + return takeOptionListBuilder_.getMessage(index); } } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder setItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (itemListBuilder_ == null) { + public Builder setTakeOptionList( + int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { + if (takeOptionListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureItemListIsMutable(); - itemList_.set(index, value); + ensureTakeOptionListIsMutable(); + takeOptionList_.set(index, value); onChanged(); } else { - itemListBuilder_.setMessage(index, value); + takeOptionListBuilder_.setMessage(index, value); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder setItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (itemListBuilder_ == null) { - ensureItemListIsMutable(); - itemList_.set(index, builderForValue.build()); + public Builder setTakeOptionList( + int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { + if (takeOptionListBuilder_ == null) { + ensureTakeOptionListIsMutable(); + takeOptionList_.set(index, builderForValue.build()); onChanged(); } else { - itemListBuilder_.setMessage(index, builderForValue.build()); + takeOptionListBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (itemListBuilder_ == null) { + public Builder addTakeOptionList(emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { + if (takeOptionListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureItemListIsMutable(); - itemList_.add(value); + ensureTakeOptionListIsMutable(); + takeOptionList_.add(value); onChanged(); } else { - itemListBuilder_.addMessage(value); + takeOptionListBuilder_.addMessage(value); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder addItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { - if (itemListBuilder_ == null) { + public Builder addTakeOptionList( + int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption value) { + if (takeOptionListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureItemListIsMutable(); - itemList_.add(index, value); + ensureTakeOptionListIsMutable(); + takeOptionList_.add(index, value); onChanged(); } else { - itemListBuilder_.addMessage(index, value); + takeOptionListBuilder_.addMessage(index, value); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder addItemList( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (itemListBuilder_ == null) { - ensureItemListIsMutable(); - itemList_.add(builderForValue.build()); + public Builder addTakeOptionList( + emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { + if (takeOptionListBuilder_ == null) { + ensureTakeOptionListIsMutable(); + takeOptionList_.add(builderForValue.build()); onChanged(); } else { - itemListBuilder_.addMessage(builderForValue.build()); + takeOptionListBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder addItemList( - int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { - if (itemListBuilder_ == null) { - ensureItemListIsMutable(); - itemList_.add(index, builderForValue.build()); + public Builder addTakeOptionList( + int index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder builderForValue) { + if (takeOptionListBuilder_ == null) { + ensureTakeOptionListIsMutable(); + takeOptionList_.add(index, builderForValue.build()); onChanged(); } else { - itemListBuilder_.addMessage(index, builderForValue.build()); + takeOptionListBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder addAllItemList( - java.lang.Iterable values) { - if (itemListBuilder_ == null) { - ensureItemListIsMutable(); + public Builder addAllTakeOptionList( + java.lang.Iterable values) { + if (takeOptionListBuilder_ == null) { + ensureTakeOptionListIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, itemList_); + values, takeOptionList_); onChanged(); } else { - itemListBuilder_.addAllMessages(values); + takeOptionListBuilder_.addAllMessages(values); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder clearItemList() { - if (itemListBuilder_ == null) { - itemList_ = java.util.Collections.emptyList(); + public Builder clearTakeOptionList() { + if (takeOptionListBuilder_ == null) { + takeOptionList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { - itemListBuilder_.clear(); + takeOptionListBuilder_.clear(); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public Builder removeItemList(int index) { - if (itemListBuilder_ == null) { - ensureItemListIsMutable(); - itemList_.remove(index); + public Builder removeTakeOptionList(int index) { + if (takeOptionListBuilder_ == null) { + ensureTakeOptionListIsMutable(); + takeOptionList_.remove(index); onChanged(); } else { - itemListBuilder_.remove(index); + takeOptionListBuilder_.remove(index); } return this; } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder( + public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder getTakeOptionListBuilder( int index) { - return getItemListFieldBuilder().getBuilder(index); + return getTakeOptionListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( + public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder getTakeOptionListOrBuilder( int index) { - if (itemListBuilder_ == null) { - return itemList_.get(index); } else { - return itemListBuilder_.getMessageOrBuilder(index); + if (takeOptionListBuilder_ == null) { + return takeOptionList_.get(index); } else { + return takeOptionListBuilder_.getMessageOrBuilder(index); } } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public java.util.List - getItemListOrBuilderList() { - if (itemListBuilder_ != null) { - return itemListBuilder_.getMessageOrBuilderList(); + public java.util.List + getTakeOptionListOrBuilderList() { + if (takeOptionListBuilder_ != null) { + return takeOptionListBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(itemList_); + return java.util.Collections.unmodifiableList(takeOptionList_); } } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() { - return getItemListFieldBuilder().addBuilder( - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder addTakeOptionListBuilder() { + return getTakeOptionListFieldBuilder().addBuilder( + emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder( + public emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder addTakeOptionListBuilder( int index) { - return getItemListFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); + return getTakeOptionListFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 14; + * repeated .BattlePassRewardTakeOption take_option_list = 13; */ - public java.util.List - getItemListBuilderList() { - return getItemListFieldBuilder().getBuilderList(); + public java.util.List + getTakeOptionListBuilderList() { + return getTakeOptionListFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> - getItemListFieldBuilder() { - if (itemListBuilder_ == null) { - itemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>( - itemList_, + emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder> + getTakeOptionListFieldBuilder() { + if (takeOptionListBuilder_ == null) { + takeOptionListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption.Builder, emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOptionOrBuilder>( + takeOptionList_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); - itemList_ = null; + takeOptionList_ = null; } - return itemListBuilder_; + return takeOptionListBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -1276,9 +1276,9 @@ public emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterClass.TakeBattlePas "\n\035TakeBattlePassRewardRsp.proto\032 BattleP" + "assRewardTakeOption.proto\032\017ItemParam.pro" + "to\"\200\001\n\027TakeBattlePassRewardRsp\022\017\n\007retcod" + - "e\030\014 \001(\005\0225\n\020take_option_list\030\004 \003(\0132\033.Batt" + - "lePassRewardTakeOption\022\035\n\titem_list\030\016 \003(" + - "\0132\n.ItemParamB\033\n\031emu.grasscutter.net.pro" + + "e\030\001 \001(\005\022\035\n\titem_list\030\006 \003(\0132\n.ItemParam\0225" + + "\n\020take_option_list\030\r \003(\0132\033.BattlePassRew" + + "ardTakeOptionB\033\n\031emu.grasscutter.net.pro" + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1292,7 +1292,7 @@ public emu.grasscutter.net.proto.TakeBattlePassRewardRspOuterClass.TakeBattlePas internal_static_TakeBattlePassRewardRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TakeBattlePassRewardRsp_descriptor, - new java.lang.String[] { "Retcode", "TakeOptionList", "ItemList", }); + new java.lang.String[] { "Retcode", "ItemList", "TakeOptionList", }); emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.getDescriptor(); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeCompoundOutputReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeCompoundOutputReqOuterClass.java index c622f2d145a..76b2a736b3c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeCompoundOutputReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeCompoundOutputReqOuterClass.java @@ -19,21 +19,27 @@ public interface TakeCompoundOutputReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 compound_group_id = 1; + * bool OLEJPBPBNHC = 4; + * @return The oLEJPBPBNHC. + */ + boolean getOLEJPBPBNHC(); + + /** + * uint32 compound_group_id = 2; * @return The compoundGroupId. */ int getCompoundGroupId(); /** - * uint32 compound_id = 2; + * uint32 compound_id = 3; * @return The compoundId. */ int getCompoundId(); } /** * 
-   * CmdId: 5837
-   * Obf: ONGBJJGLNAP
+   * CmdId: 24016
+   * obf: FADLJEMABNC
    *
* * Protobuf type {@code TakeCompoundOutputReq} @@ -80,16 +86,21 @@ private TakeCompoundOutputReq( case 0: done = true; break; - case 8: { + case 16: { compoundGroupId_ = input.readUInt32(); break; } - case 16: { + case 24: { compoundId_ = input.readUInt32(); break; } + case 32: { + + oLEJPBPBNHC_ = input.readBool(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -122,10 +133,21 @@ private TakeCompoundOutputReq( emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq.class, emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq.Builder.class); } - public static final int COMPOUND_GROUP_ID_FIELD_NUMBER = 1; + public static final int OLEJPBPBNHC_FIELD_NUMBER = 4; + private boolean oLEJPBPBNHC_; + /** + * bool OLEJPBPBNHC = 4; + * @return The oLEJPBPBNHC. + */ + @java.lang.Override + public boolean getOLEJPBPBNHC() { + return oLEJPBPBNHC_; + } + + public static final int COMPOUND_GROUP_ID_FIELD_NUMBER = 2; private int compoundGroupId_; /** - * uint32 compound_group_id = 1; + * uint32 compound_group_id = 2; * @return The compoundGroupId. */ @java.lang.Override @@ -133,10 +155,10 @@ public int getCompoundGroupId() { return compoundGroupId_; } - public static final int COMPOUND_ID_FIELD_NUMBER = 2; + public static final int COMPOUND_ID_FIELD_NUMBER = 3; private int compoundId_; /** - * uint32 compound_id = 2; + * uint32 compound_id = 3; * @return The compoundId. */ @java.lang.Override @@ -159,10 +181,13 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (compoundGroupId_ != 0) { - output.writeUInt32(1, compoundGroupId_); + output.writeUInt32(2, compoundGroupId_); } if (compoundId_ != 0) { - output.writeUInt32(2, compoundId_); + output.writeUInt32(3, compoundId_); + } + if (oLEJPBPBNHC_ != false) { + output.writeBool(4, oLEJPBPBNHC_); } unknownFields.writeTo(output); } @@ -175,11 +200,15 @@ public int getSerializedSize() { size = 0; if (compoundGroupId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, compoundGroupId_); + .computeUInt32Size(2, compoundGroupId_); } if (compoundId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, compoundId_); + .computeUInt32Size(3, compoundId_); + } + if (oLEJPBPBNHC_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, oLEJPBPBNHC_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,6 +225,8 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq other = (emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq) obj; + if (getOLEJPBPBNHC() + != other.getOLEJPBPBNHC()) return false; if (getCompoundGroupId() != other.getCompoundGroupId()) return false; if (getCompoundId() @@ -211,6 +242,9 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + OLEJPBPBNHC_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getOLEJPBPBNHC()); hash = (37 * hash) + COMPOUND_GROUP_ID_FIELD_NUMBER; hash = (53 * hash) + getCompoundGroupId(); hash = (37 * hash) + COMPOUND_ID_FIELD_NUMBER; @@ -312,8 +346,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5837
-     * Obf: ONGBJJGLNAP
+     * CmdId: 24016
+     * obf: FADLJEMABNC
      *
* * Protobuf type {@code TakeCompoundOutputReq} @@ -353,6 +387,8 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + oLEJPBPBNHC_ = false; + compoundGroupId_ = 0; compoundId_ = 0; @@ -383,6 +419,7 @@ public emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOut @java.lang.Override public emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq buildPartial() { emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq result = new emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq(this); + result.oLEJPBPBNHC_ = oLEJPBPBNHC_; result.compoundGroupId_ = compoundGroupId_; result.compoundId_ = compoundId_; onBuilt(); @@ -433,6 +470,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq other) { if (other == emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOutputReq.getDefaultInstance()) return this; + if (other.getOLEJPBPBNHC() != false) { + setOLEJPBPBNHC(other.getOLEJPBPBNHC()); + } if (other.getCompoundGroupId() != 0) { setCompoundGroupId(other.getCompoundGroupId()); } @@ -468,9 +508,40 @@ public Builder mergeFrom( return this; } + private boolean oLEJPBPBNHC_ ; + /** + * bool OLEJPBPBNHC = 4; + * @return The oLEJPBPBNHC. + */ + @java.lang.Override + public boolean getOLEJPBPBNHC() { + return oLEJPBPBNHC_; + } + /** + * bool OLEJPBPBNHC = 4; + * @param value The oLEJPBPBNHC to set. + * @return This builder for chaining. + */ + public Builder setOLEJPBPBNHC(boolean value) { + + oLEJPBPBNHC_ = value; + onChanged(); + return this; + } + /** + * bool OLEJPBPBNHC = 4; + * @return This builder for chaining. + */ + public Builder clearOLEJPBPBNHC() { + + oLEJPBPBNHC_ = false; + onChanged(); + return this; + } + private int compoundGroupId_ ; /** - * uint32 compound_group_id = 1; + * uint32 compound_group_id = 2; * @return The compoundGroupId. */ @java.lang.Override @@ -478,7 +549,7 @@ public int getCompoundGroupId() { return compoundGroupId_; } /** - * uint32 compound_group_id = 1; + * uint32 compound_group_id = 2; * @param value The compoundGroupId to set. * @return This builder for chaining. */ @@ -489,7 +560,7 @@ public Builder setCompoundGroupId(int value) { return this; } /** - * uint32 compound_group_id = 1; + * uint32 compound_group_id = 2; * @return This builder for chaining. */ public Builder clearCompoundGroupId() { @@ -501,7 +572,7 @@ public Builder clearCompoundGroupId() { private int compoundId_ ; /** - * uint32 compound_id = 2; + * uint32 compound_id = 3; * @return The compoundId. */ @java.lang.Override @@ -509,7 +580,7 @@ public int getCompoundId() { return compoundId_; } /** - * uint32 compound_id = 2; + * uint32 compound_id = 3; * @param value The compoundId to set. * @return This builder for chaining. */ @@ -520,7 +591,7 @@ public Builder setCompoundId(int value) { return this; } /** - * uint32 compound_id = 2; + * uint32 compound_id = 3; * @return This builder for chaining. */ public Builder clearCompoundId() { @@ -596,10 +667,10 @@ public emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOut descriptor; static { java.lang.String[] descriptorData = { - "\n\033TakeCompoundOutputReq.proto\"G\n\025TakeCom" + - "poundOutputReq\022\031\n\021compound_group_id\030\001 \001(" + - "\r\022\023\n\013compound_id\030\002 \001(\rB\033\n\031emu.grasscutte" + - "r.net.protob\006proto3" + "\n\033TakeCompoundOutputReq.proto\"\\\n\025TakeCom" + + "poundOutputReq\022\023\n\013OLEJPBPBNHC\030\004 \001(\010\022\031\n\021c" + + "ompound_group_id\030\002 \001(\r\022\023\n\013compound_id\030\003 " + + "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -610,7 +681,7 @@ public emu.grasscutter.net.proto.TakeCompoundOutputReqOuterClass.TakeCompoundOut internal_static_TakeCompoundOutputReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TakeCompoundOutputReq_descriptor, - new java.lang.String[] { "CompoundGroupId", "CompoundId", }); + new java.lang.String[] { "OLEJPBPBNHC", "CompoundGroupId", "CompoundId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeCompoundOutputRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeCompoundOutputRspOuterClass.java index c8013c8dde2..247969bd196 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeCompoundOutputRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeCompoundOutputRspOuterClass.java @@ -19,39 +19,39 @@ public interface TakeCompoundOutputRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 3; + * int32 retcode = 10; * @return The retcode. */ int getRetcode(); /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ java.util.List getItemListList(); /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index); /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ int getItemListCount(); /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ java.util.List getItemListOrBuilderList(); /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index); } /** * 
-   * CmdId: 28960
-   * Obf: EBCIEMBFFMG
+   * CmdId: 1235
+   * obf: JFPKJCOODDH
    *
* * Protobuf type {@code TakeCompoundOutputRsp} @@ -100,12 +100,12 @@ private TakeCompoundOutputRsp( case 0: done = true; break; - case 24: { + case 80: { retcode_ = input.readInt32(); break; } - case 34: { + case 106: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { itemList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -149,10 +149,10 @@ private TakeCompoundOutputRsp( emu.grasscutter.net.proto.TakeCompoundOutputRspOuterClass.TakeCompoundOutputRsp.class, emu.grasscutter.net.proto.TakeCompoundOutputRspOuterClass.TakeCompoundOutputRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 3; + public static final int RETCODE_FIELD_NUMBER = 10; private int retcode_; /** - * int32 retcode = 3; + * int32 retcode = 10; * @return The retcode. */ @java.lang.Override @@ -160,17 +160,17 @@ public int getRetcode() { return retcode_; } - public static final int ITEM_LIST_FIELD_NUMBER = 4; + public static final int ITEM_LIST_FIELD_NUMBER = 13; private java.util.List itemList_; /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ @java.lang.Override public java.util.List getItemListList() { return itemList_; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ @java.lang.Override public java.util.List @@ -178,21 +178,21 @@ public java.util.List g return itemList_; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ @java.lang.Override public int getItemListCount() { return itemList_.size(); } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { return itemList_.get(index); } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( @@ -215,10 +215,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (retcode_ != 0) { - output.writeInt32(3, retcode_); + output.writeInt32(10, retcode_); } for (int i = 0; i < itemList_.size(); i++) { - output.writeMessage(4, itemList_.get(i)); + output.writeMessage(13, itemList_.get(i)); } unknownFields.writeTo(output); } @@ -231,11 +231,11 @@ public int getSerializedSize() { size = 0; if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, retcode_); + .computeInt32Size(10, retcode_); } for (int i = 0; i < itemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, itemList_.get(i)); + .computeMessageSize(13, itemList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -370,8 +370,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28960
-     * Obf: EBCIEMBFFMG
+     * CmdId: 1235
+     * obf: JFPKJCOODDH
      *
* * Protobuf type {@code TakeCompoundOutputRsp} @@ -566,7 +566,7 @@ public Builder mergeFrom( private int retcode_ ; /** - * int32 retcode = 3; + * int32 retcode = 10; * @return The retcode. */ @java.lang.Override @@ -574,7 +574,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 3; + * int32 retcode = 10; * @param value The retcode to set. * @return This builder for chaining. */ @@ -585,7 +585,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 3; + * int32 retcode = 10; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -608,7 +608,7 @@ private void ensureItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_; /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public java.util.List getItemListList() { if (itemListBuilder_ == null) { @@ -618,7 +618,7 @@ public java.util.List g } } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public int getItemListCount() { if (itemListBuilder_ == null) { @@ -628,7 +628,7 @@ public int getItemListCount() { } } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) { if (itemListBuilder_ == null) { @@ -638,7 +638,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int i } } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -655,7 +655,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder setItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -669,7 +669,7 @@ public Builder setItemList( return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (itemListBuilder_ == null) { @@ -685,7 +685,7 @@ public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemPar return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -702,7 +702,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder addItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -716,7 +716,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder addItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -730,7 +730,7 @@ public Builder addItemList( return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder addAllItemList( java.lang.Iterable values) { @@ -745,7 +745,7 @@ public Builder addAllItemList( return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder clearItemList() { if (itemListBuilder_ == null) { @@ -758,7 +758,7 @@ public Builder clearItemList() { return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public Builder removeItemList(int index) { if (itemListBuilder_ == null) { @@ -771,14 +771,14 @@ public Builder removeItemList(int index) { return this; } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder( int index) { return getItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder( int index) { @@ -788,7 +788,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL } } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public java.util.List getItemListOrBuilderList() { @@ -799,14 +799,14 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemL } } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() { return getItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder( int index) { @@ -814,7 +814,7 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemLi index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam item_list = 4; + * repeated .ItemParam item_list = 13; */ public java.util.List getItemListBuilderList() { @@ -903,7 +903,7 @@ public emu.grasscutter.net.proto.TakeCompoundOutputRspOuterClass.TakeCompoundOut java.lang.String[] descriptorData = { "\n\033TakeCompoundOutputRsp.proto\032\017ItemParam" + ".proto\"G\n\025TakeCompoundOutputRsp\022\017\n\007retco" + - "de\030\003 \001(\005\022\035\n\titem_list\030\004 \003(\0132\n.ItemParamB" + + "de\030\n \001(\005\022\035\n\titem_list\030\r \003(\0132\n.ItemParamB" + "\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeFurnitureMakeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeFurnitureMakeReqOuterClass.java index 4d4945c829f..1a3d5b4aabb 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeFurnitureMakeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeFurnitureMakeReqOuterClass.java @@ -19,27 +19,27 @@ public interface TakeFurnitureMakeReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 index = 1; + * uint32 make_id = 3; + * @return The makeId. + */ + int getMakeId(); + + /** + * uint32 index = 15; * @return The index. */ int getIndex(); /** - * bool is_fast_finish = 7; + * bool is_fast_finish = 9; * @return The isFastFinish. */ boolean getIsFastFinish(); - - /** - * uint32 make_id = 13; - * @return The makeId. - */ - int getMakeId(); } /** * 
-   * CmdId: 28389
-   * Obf: FCKFFOJJNDH
+   * CmdId: 2795
+   * obf: LCDHKFLCNBD
    *
* * Protobuf type {@code TakeFurnitureMakeReq} @@ -86,19 +86,19 @@ private TakeFurnitureMakeReq( case 0: done = true; break; - case 8: { + case 24: { - index_ = input.readUInt32(); + makeId_ = input.readUInt32(); break; } - case 56: { + case 72: { isFastFinish_ = input.readBool(); break; } - case 104: { + case 120: { - makeId_ = input.readUInt32(); + index_ = input.readUInt32(); break; } default: { @@ -133,10 +133,21 @@ private TakeFurnitureMakeReq( emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq.class, emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq.Builder.class); } - public static final int INDEX_FIELD_NUMBER = 1; + public static final int MAKE_ID_FIELD_NUMBER = 3; + private int makeId_; + /** + * uint32 make_id = 3; + * @return The makeId. + */ + @java.lang.Override + public int getMakeId() { + return makeId_; + } + + public static final int INDEX_FIELD_NUMBER = 15; private int index_; /** - * uint32 index = 1; + * uint32 index = 15; * @return The index. */ @java.lang.Override @@ -144,10 +155,10 @@ public int getIndex() { return index_; } - public static final int IS_FAST_FINISH_FIELD_NUMBER = 7; + public static final int IS_FAST_FINISH_FIELD_NUMBER = 9; private boolean isFastFinish_; /** - * bool is_fast_finish = 7; + * bool is_fast_finish = 9; * @return The isFastFinish. */ @java.lang.Override @@ -155,17 +166,6 @@ public boolean getIsFastFinish() { return isFastFinish_; } - public static final int MAKE_ID_FIELD_NUMBER = 13; - private int makeId_; - /** - * uint32 make_id = 13; - * @return The makeId. - */ - @java.lang.Override - public int getMakeId() { - return makeId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (index_ != 0) { - output.writeUInt32(1, index_); + if (makeId_ != 0) { + output.writeUInt32(3, makeId_); } if (isFastFinish_ != false) { - output.writeBool(7, isFastFinish_); + output.writeBool(9, isFastFinish_); } - if (makeId_ != 0) { - output.writeUInt32(13, makeId_); + if (index_ != 0) { + output.writeUInt32(15, index_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (index_ != 0) { + if (makeId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, index_); + .computeUInt32Size(3, makeId_); } if (isFastFinish_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, isFastFinish_); + .computeBoolSize(9, isFastFinish_); } - if (makeId_ != 0) { + if (index_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, makeId_); + .computeUInt32Size(15, index_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +225,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq other = (emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq) obj; + if (getMakeId() + != other.getMakeId()) return false; if (getIndex() != other.getIndex()) return false; if (getIsFastFinish() != other.getIsFastFinish()) return false; - if (getMakeId() - != other.getMakeId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,13 +242,13 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MAKE_ID_FIELD_NUMBER; + hash = (53 * hash) + getMakeId(); hash = (37 * hash) + INDEX_FIELD_NUMBER; hash = (53 * hash) + getIndex(); hash = (37 * hash) + IS_FAST_FINISH_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsFastFinish()); - hash = (37 * hash) + MAKE_ID_FIELD_NUMBER; - hash = (53 * hash) + getMakeId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -346,8 +346,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28389
-     * Obf: FCKFFOJJNDH
+     * CmdId: 2795
+     * obf: LCDHKFLCNBD
      *
* * Protobuf type {@code TakeFurnitureMakeReq} @@ -387,12 +387,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + makeId_ = 0; + index_ = 0; isFastFinish_ = false; - makeId_ = 0; - return this; } @@ -419,9 +419,9 @@ public emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMak @java.lang.Override public emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq buildPartial() { emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq result = new emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq(this); + result.makeId_ = makeId_; result.index_ = index_; result.isFastFinish_ = isFastFinish_; - result.makeId_ = makeId_; onBuilt(); return result; } @@ -470,15 +470,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq other) { if (other == emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMakeReq.getDefaultInstance()) return this; + if (other.getMakeId() != 0) { + setMakeId(other.getMakeId()); + } if (other.getIndex() != 0) { setIndex(other.getIndex()); } if (other.getIsFastFinish() != false) { setIsFastFinish(other.getIsFastFinish()); } - if (other.getMakeId() != 0) { - setMakeId(other.getMakeId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -508,95 +508,95 @@ public Builder mergeFrom( return this; } - private int index_ ; + private int makeId_ ; /** - * uint32 index = 1; - * @return The index. + * uint32 make_id = 3; + * @return The makeId. */ @java.lang.Override - public int getIndex() { - return index_; + public int getMakeId() { + return makeId_; } /** - * uint32 index = 1; - * @param value The index to set. + * uint32 make_id = 3; + * @param value The makeId to set. * @return This builder for chaining. */ - public Builder setIndex(int value) { + public Builder setMakeId(int value) { - index_ = value; + makeId_ = value; onChanged(); return this; } /** - * uint32 index = 1; + * uint32 make_id = 3; * @return This builder for chaining. */ - public Builder clearIndex() { + public Builder clearMakeId() { - index_ = 0; + makeId_ = 0; onChanged(); return this; } - private boolean isFastFinish_ ; + private int index_ ; /** - * bool is_fast_finish = 7; - * @return The isFastFinish. + * uint32 index = 15; + * @return The index. */ @java.lang.Override - public boolean getIsFastFinish() { - return isFastFinish_; + public int getIndex() { + return index_; } /** - * bool is_fast_finish = 7; - * @param value The isFastFinish to set. + * uint32 index = 15; + * @param value The index to set. * @return This builder for chaining. */ - public Builder setIsFastFinish(boolean value) { + public Builder setIndex(int value) { - isFastFinish_ = value; + index_ = value; onChanged(); return this; } /** - * bool is_fast_finish = 7; + * uint32 index = 15; * @return This builder for chaining. */ - public Builder clearIsFastFinish() { + public Builder clearIndex() { - isFastFinish_ = false; + index_ = 0; onChanged(); return this; } - private int makeId_ ; + private boolean isFastFinish_ ; /** - * uint32 make_id = 13; - * @return The makeId. + * bool is_fast_finish = 9; + * @return The isFastFinish. */ @java.lang.Override - public int getMakeId() { - return makeId_; + public boolean getIsFastFinish() { + return isFastFinish_; } /** - * uint32 make_id = 13; - * @param value The makeId to set. + * bool is_fast_finish = 9; + * @param value The isFastFinish to set. * @return This builder for chaining. */ - public Builder setMakeId(int value) { + public Builder setIsFastFinish(boolean value) { - makeId_ = value; + isFastFinish_ = value; onChanged(); return this; } /** - * uint32 make_id = 13; + * bool is_fast_finish = 9; * @return This builder for chaining. */ - public Builder clearMakeId() { + public Builder clearIsFastFinish() { - makeId_ = 0; + isFastFinish_ = false; onChanged(); return this; } @@ -668,8 +668,8 @@ public emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMak static { java.lang.String[] descriptorData = { "\n\032TakeFurnitureMakeReq.proto\"N\n\024TakeFurn" + - "itureMakeReq\022\r\n\005index\030\001 \001(\r\022\026\n\016is_fast_f" + - "inish\030\007 \001(\010\022\017\n\007make_id\030\r \001(\rB\033\n\031emu.gras" + + "itureMakeReq\022\017\n\007make_id\030\003 \001(\r\022\r\n\005index\030\017" + + " \001(\r\022\026\n\016is_fast_finish\030\t \001(\010B\033\n\031emu.gras" + "scutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +681,7 @@ public emu.grasscutter.net.proto.TakeFurnitureMakeReqOuterClass.TakeFurnitureMak internal_static_TakeFurnitureMakeReq_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TakeFurnitureMakeReq_descriptor, - new java.lang.String[] { "Index", "IsFastFinish", "MakeId", }); + new java.lang.String[] { "MakeId", "Index", "IsFastFinish", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeFurnitureMakeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeFurnitureMakeRspOuterClass.java index 2ca690707a7..82a362aa63c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeFurnitureMakeRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeFurnitureMakeRspOuterClass.java @@ -19,64 +19,110 @@ public interface TakeFurnitureMakeRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .ItemParam return_item_list = 4; + * .FurnitureMakeSlot furniture_make_slot = 3; + * @return Whether the furnitureMakeSlot field is set. + */ + boolean hasFurnitureMakeSlot(); + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + * @return The furnitureMakeSlot. + */ + emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot getFurnitureMakeSlot(); + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder(); + + /** + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ java.util.List getReturnItemListList(); /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getReturnItemList(int index); /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ int getReturnItemListCount(); /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ java.util.List getReturnItemListOrBuilderList(); /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getReturnItemListOrBuilder( int index); /** - * .FurnitureMakeSlot furniture_make_slot = 3; - * @return Whether the furnitureMakeSlot field is set. - */ - boolean hasFurnitureMakeSlot(); - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - * @return The furnitureMakeSlot. - */ - emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot getFurnitureMakeSlot(); - /** - * .FurnitureMakeSlot furniture_make_slot = 3; + * int32 retcode = 8; + * @return The retcode. */ - emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder(); + int getRetcode(); /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ java.util.List getOutputItemListList(); /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getOutputItemList(int index); /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ int getOutputItemListCount(); /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ java.util.List getOutputItemListOrBuilderList(); /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOutputItemListOrBuilder( int index); @@ -86,17 +132,11 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOutputItemLi * @return The makeId. */ int getMakeId(); - - /** - * int32 retcode = 7; - * @return The retcode. - */ - int getRetcode(); } /** * 
-   * CmdId: 6814
-   * Obf: JHIOLDPMBAC
+   * CmdId: 6584
+   * obf: NKPACMDAIDM
    *
* * Protobuf type {@code TakeFurnitureMakeRsp} @@ -159,7 +199,7 @@ private TakeFurnitureMakeRsp( break; } - case 34: { + case 50: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { returnItemList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -168,7 +208,12 @@ private TakeFurnitureMakeRsp( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 50: { + case 64: { + + retcode_ = input.readInt32(); + break; + } + case 98: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { outputItemList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -177,11 +222,6 @@ private TakeFurnitureMakeRsp( input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry)); break; } - case 56: { - - retcode_ = input.readInt32(); - break; - } case 104: { makeId_ = input.readUInt32(); @@ -225,17 +265,51 @@ private TakeFurnitureMakeRsp( emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp.class, emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp.Builder.class); } - public static final int RETURN_ITEM_LIST_FIELD_NUMBER = 4; + public static final int FURNITURE_MAKE_SLOT_FIELD_NUMBER = 3; + private emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot furnitureMakeSlot_; + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + * @return Whether the furnitureMakeSlot field is set. + */ + @java.lang.Override + public boolean hasFurnitureMakeSlot() { + return furnitureMakeSlot_ != null; + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + * @return The furnitureMakeSlot. + */ + @java.lang.Override + public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot getFurnitureMakeSlot() { + return furnitureMakeSlot_ == null ? emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.getDefaultInstance() : furnitureMakeSlot_; + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + @java.lang.Override + public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder() { + return getFurnitureMakeSlot(); + } + + public static final int RETURN_ITEM_LIST_FIELD_NUMBER = 6; private java.util.List returnItemList_; /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ @java.lang.Override public java.util.List getReturnItemListList() { return returnItemList_; } /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ @java.lang.Override public java.util.List @@ -243,21 +317,33 @@ public java.util.List g return returnItemList_; } /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ @java.lang.Override public int getReturnItemListCount() { return returnItemList_.size(); } /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getReturnItemList(int index) { return returnItemList_.get(index); } /** - * repeated .ItemParam return_item_list = 4; + * 
+     * obf: MKMHPOMEAHP 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam return_item_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getReturnItemListOrBuilder( @@ -265,43 +351,36 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRetur return returnItemList_.get(index); } - public static final int FURNITURE_MAKE_SLOT_FIELD_NUMBER = 3; - private emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot furnitureMakeSlot_; - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - * @return Whether the furnitureMakeSlot field is set. - */ - @java.lang.Override - public boolean hasFurnitureMakeSlot() { - return furnitureMakeSlot_ != null; - } - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - * @return The furnitureMakeSlot. - */ - @java.lang.Override - public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot getFurnitureMakeSlot() { - return furnitureMakeSlot_ == null ? emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.getDefaultInstance() : furnitureMakeSlot_; - } + public static final int RETCODE_FIELD_NUMBER = 8; + private int retcode_; /** - * .FurnitureMakeSlot furniture_make_slot = 3; + * int32 retcode = 8; + * @return The retcode. */ @java.lang.Override - public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder() { - return getFurnitureMakeSlot(); + public int getRetcode() { + return retcode_; } - public static final int OUTPUT_ITEM_LIST_FIELD_NUMBER = 6; + public static final int OUTPUT_ITEM_LIST_FIELD_NUMBER = 12; private java.util.List outputItemList_; /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ @java.lang.Override public java.util.List getOutputItemListList() { return outputItemList_; } /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ @java.lang.Override public java.util.List @@ -309,21 +388,33 @@ public java.util.List g return outputItemList_; } /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ @java.lang.Override public int getOutputItemListCount() { return outputItemList_.size(); } /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getOutputItemList(int index) { return outputItemList_.get(index); } /** - * repeated .ItemParam output_item_list = 6; + * 
+     * obf: GBEPKGLFBFD 字段可能猜的是错的
+     *
+ * + * repeated .ItemParam output_item_list = 12; */ @java.lang.Override public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOutputItemListOrBuilder( @@ -342,17 +433,6 @@ public int getMakeId() { return makeId_; } - public static final int RETCODE_FIELD_NUMBER = 7; - private int retcode_; - /** - * int32 retcode = 7; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -371,13 +451,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeMessage(3, getFurnitureMakeSlot()); } for (int i = 0; i < returnItemList_.size(); i++) { - output.writeMessage(4, returnItemList_.get(i)); - } - for (int i = 0; i < outputItemList_.size(); i++) { - output.writeMessage(6, outputItemList_.get(i)); + output.writeMessage(6, returnItemList_.get(i)); } if (retcode_ != 0) { - output.writeInt32(7, retcode_); + output.writeInt32(8, retcode_); + } + for (int i = 0; i < outputItemList_.size(); i++) { + output.writeMessage(12, outputItemList_.get(i)); } if (makeId_ != 0) { output.writeUInt32(13, makeId_); @@ -397,15 +477,15 @@ public int getSerializedSize() { } for (int i = 0; i < returnItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, returnItemList_.get(i)); + .computeMessageSize(6, returnItemList_.get(i)); } - for (int i = 0; i < outputItemList_.size(); i++) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, outputItemList_.get(i)); + .computeInt32Size(8, retcode_); } - if (retcode_ != 0) { + for (int i = 0; i < outputItemList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(7, retcode_); + .computeMessageSize(12, outputItemList_.get(i)); } if (makeId_ != 0) { size += com.google.protobuf.CodedOutputStream @@ -426,19 +506,19 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp other = (emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp) obj; - if (!getReturnItemListList() - .equals(other.getReturnItemListList())) return false; if (hasFurnitureMakeSlot() != other.hasFurnitureMakeSlot()) return false; if (hasFurnitureMakeSlot()) { if (!getFurnitureMakeSlot() .equals(other.getFurnitureMakeSlot())) return false; } + if (!getReturnItemListList() + .equals(other.getReturnItemListList())) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!getOutputItemListList() .equals(other.getOutputItemListList())) return false; if (getMakeId() != other.getMakeId()) return false; - if (getRetcode() - != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -450,22 +530,22 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getReturnItemListCount() > 0) { - hash = (37 * hash) + RETURN_ITEM_LIST_FIELD_NUMBER; - hash = (53 * hash) + getReturnItemListList().hashCode(); - } if (hasFurnitureMakeSlot()) { hash = (37 * hash) + FURNITURE_MAKE_SLOT_FIELD_NUMBER; hash = (53 * hash) + getFurnitureMakeSlot().hashCode(); } + if (getReturnItemListCount() > 0) { + hash = (37 * hash) + RETURN_ITEM_LIST_FIELD_NUMBER; + hash = (53 * hash) + getReturnItemListList().hashCode(); + } + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); if (getOutputItemListCount() > 0) { hash = (37 * hash) + OUTPUT_ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getOutputItemListList().hashCode(); } hash = (37 * hash) + MAKE_ID_FIELD_NUMBER; hash = (53 * hash) + getMakeId(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -563,8 +643,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 6814
-     * Obf: JHIOLDPMBAC
+     * CmdId: 6584
+     * obf: NKPACMDAIDM
      *
* * Protobuf type {@code TakeFurnitureMakeRsp} @@ -606,18 +686,20 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (returnItemListBuilder_ == null) { - returnItemList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - returnItemListBuilder_.clear(); - } if (furnitureMakeSlotBuilder_ == null) { furnitureMakeSlot_ = null; } else { furnitureMakeSlot_ = null; furnitureMakeSlotBuilder_ = null; } + if (returnItemListBuilder_ == null) { + returnItemList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + returnItemListBuilder_.clear(); + } + retcode_ = 0; + if (outputItemListBuilder_ == null) { outputItemList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); @@ -626,8 +708,6 @@ public Builder clear() { } makeId_ = 0; - retcode_ = 0; - return this; } @@ -655,6 +735,11 @@ public emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMak public emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp buildPartial() { emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp result = new emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp(this); int from_bitField0_ = bitField0_; + if (furnitureMakeSlotBuilder_ == null) { + result.furnitureMakeSlot_ = furnitureMakeSlot_; + } else { + result.furnitureMakeSlot_ = furnitureMakeSlotBuilder_.build(); + } if (returnItemListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { returnItemList_ = java.util.Collections.unmodifiableList(returnItemList_); @@ -664,11 +749,7 @@ public emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMak } else { result.returnItemList_ = returnItemListBuilder_.build(); } - if (furnitureMakeSlotBuilder_ == null) { - result.furnitureMakeSlot_ = furnitureMakeSlot_; - } else { - result.furnitureMakeSlot_ = furnitureMakeSlotBuilder_.build(); - } + result.retcode_ = retcode_; if (outputItemListBuilder_ == null) { if (((bitField0_ & 0x00000002) != 0)) { outputItemList_ = java.util.Collections.unmodifiableList(outputItemList_); @@ -679,7 +760,6 @@ public emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMak result.outputItemList_ = outputItemListBuilder_.build(); } result.makeId_ = makeId_; - result.retcode_ = retcode_; onBuilt(); return result; } @@ -728,6 +808,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp other) { if (other == emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMakeRsp.getDefaultInstance()) return this; + if (other.hasFurnitureMakeSlot()) { + mergeFurnitureMakeSlot(other.getFurnitureMakeSlot()); + } if (returnItemListBuilder_ == null) { if (!other.returnItemList_.isEmpty()) { if (returnItemList_.isEmpty()) { @@ -754,8 +837,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClas } } } - if (other.hasFurnitureMakeSlot()) { - mergeFurnitureMakeSlot(other.getFurnitureMakeSlot()); + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } if (outputItemListBuilder_ == null) { if (!other.outputItemList_.isEmpty()) { @@ -786,9 +869,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClas if (other.getMakeId() != 0) { setMakeId(other.getMakeId()); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -819,6 +899,125 @@ public Builder mergeFrom( } private int bitField0_; + private emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot furnitureMakeSlot_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder> furnitureMakeSlotBuilder_; + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + * @return Whether the furnitureMakeSlot field is set. + */ + public boolean hasFurnitureMakeSlot() { + return furnitureMakeSlotBuilder_ != null || furnitureMakeSlot_ != null; + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + * @return The furnitureMakeSlot. + */ + public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot getFurnitureMakeSlot() { + if (furnitureMakeSlotBuilder_ == null) { + return furnitureMakeSlot_ == null ? emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.getDefaultInstance() : furnitureMakeSlot_; + } else { + return furnitureMakeSlotBuilder_.getMessage(); + } + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + public Builder setFurnitureMakeSlot(emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot value) { + if (furnitureMakeSlotBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + furnitureMakeSlot_ = value; + onChanged(); + } else { + furnitureMakeSlotBuilder_.setMessage(value); + } + + return this; + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + public Builder setFurnitureMakeSlot( + emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder builderForValue) { + if (furnitureMakeSlotBuilder_ == null) { + furnitureMakeSlot_ = builderForValue.build(); + onChanged(); + } else { + furnitureMakeSlotBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + public Builder mergeFurnitureMakeSlot(emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot value) { + if (furnitureMakeSlotBuilder_ == null) { + if (furnitureMakeSlot_ != null) { + furnitureMakeSlot_ = + emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.newBuilder(furnitureMakeSlot_).mergeFrom(value).buildPartial(); + } else { + furnitureMakeSlot_ = value; + } + onChanged(); + } else { + furnitureMakeSlotBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + public Builder clearFurnitureMakeSlot() { + if (furnitureMakeSlotBuilder_ == null) { + furnitureMakeSlot_ = null; + onChanged(); + } else { + furnitureMakeSlot_ = null; + furnitureMakeSlotBuilder_ = null; + } + + return this; + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder getFurnitureMakeSlotBuilder() { + + onChanged(); + return getFurnitureMakeSlotFieldBuilder().getBuilder(); + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder() { + if (furnitureMakeSlotBuilder_ != null) { + return furnitureMakeSlotBuilder_.getMessageOrBuilder(); + } else { + return furnitureMakeSlot_ == null ? + emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.getDefaultInstance() : furnitureMakeSlot_; + } + } + /** + * .FurnitureMakeSlot furniture_make_slot = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder> + getFurnitureMakeSlotFieldBuilder() { + if (furnitureMakeSlotBuilder_ == null) { + furnitureMakeSlotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder>( + getFurnitureMakeSlot(), + getParentForChildren(), + isClean()); + furnitureMakeSlot_ = null; + } + return furnitureMakeSlotBuilder_; + } + private java.util.List returnItemList_ = java.util.Collections.emptyList(); private void ensureReturnItemListIsMutable() { @@ -832,7 +1031,11 @@ private void ensureReturnItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> returnItemListBuilder_; /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public java.util.List getReturnItemListList() { if (returnItemListBuilder_ == null) { @@ -842,7 +1045,11 @@ public java.util.List g } } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public int getReturnItemListCount() { if (returnItemListBuilder_ == null) { @@ -852,7 +1059,11 @@ public int getReturnItemListCount() { } } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getReturnItemList(int index) { if (returnItemListBuilder_ == null) { @@ -862,7 +1073,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getReturnItemList } } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder setReturnItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -879,7 +1094,11 @@ public Builder setReturnItemList( return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder setReturnItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -893,7 +1112,11 @@ public Builder setReturnItemList( return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder addReturnItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (returnItemListBuilder_ == null) { @@ -909,7 +1132,11 @@ public Builder addReturnItemList(emu.grasscutter.net.proto.ItemParamOuterClass.I return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder addReturnItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -926,7 +1153,11 @@ public Builder addReturnItemList( return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder addReturnItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -940,7 +1171,11 @@ public Builder addReturnItemList( return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder addReturnItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -954,7 +1189,11 @@ public Builder addReturnItemList( return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder addAllReturnItemList( java.lang.Iterable values) { @@ -969,7 +1208,11 @@ public Builder addAllReturnItemList( return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder clearReturnItemList() { if (returnItemListBuilder_ == null) { @@ -982,7 +1225,11 @@ public Builder clearReturnItemList() { return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public Builder removeReturnItemList(int index) { if (returnItemListBuilder_ == null) { @@ -995,14 +1242,22 @@ public Builder removeReturnItemList(int index) { return this; } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getReturnItemListBuilder( int index) { return getReturnItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getReturnItemListOrBuilder( int index) { @@ -1012,7 +1267,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRetur } } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public java.util.List getReturnItemListOrBuilderList() { @@ -1023,14 +1282,22 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRetur } } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addReturnItemListBuilder() { return getReturnItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addReturnItemListBuilder( int index) { @@ -1038,7 +1305,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addReturn index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam return_item_list = 4; + * 
+       * obf: MKMHPOMEAHP 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam return_item_list = 6; */ public java.util.List getReturnItemListBuilderList() { @@ -1059,123 +1330,35 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addReturn return returnItemListBuilder_; } - private emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot furnitureMakeSlot_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder> furnitureMakeSlotBuilder_; - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - * @return Whether the furnitureMakeSlot field is set. - */ - public boolean hasFurnitureMakeSlot() { - return furnitureMakeSlotBuilder_ != null || furnitureMakeSlot_ != null; - } - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - * @return The furnitureMakeSlot. - */ - public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot getFurnitureMakeSlot() { - if (furnitureMakeSlotBuilder_ == null) { - return furnitureMakeSlot_ == null ? emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.getDefaultInstance() : furnitureMakeSlot_; - } else { - return furnitureMakeSlotBuilder_.getMessage(); - } - } - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - */ - public Builder setFurnitureMakeSlot(emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot value) { - if (furnitureMakeSlotBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - furnitureMakeSlot_ = value; - onChanged(); - } else { - furnitureMakeSlotBuilder_.setMessage(value); - } - - return this; - } - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - */ - public Builder setFurnitureMakeSlot( - emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder builderForValue) { - if (furnitureMakeSlotBuilder_ == null) { - furnitureMakeSlot_ = builderForValue.build(); - onChanged(); - } else { - furnitureMakeSlotBuilder_.setMessage(builderForValue.build()); - } - - return this; - } + private int retcode_ ; /** - * .FurnitureMakeSlot furniture_make_slot = 3; + * int32 retcode = 8; + * @return The retcode. */ - public Builder mergeFurnitureMakeSlot(emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot value) { - if (furnitureMakeSlotBuilder_ == null) { - if (furnitureMakeSlot_ != null) { - furnitureMakeSlot_ = - emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.newBuilder(furnitureMakeSlot_).mergeFrom(value).buildPartial(); - } else { - furnitureMakeSlot_ = value; - } - onChanged(); - } else { - furnitureMakeSlotBuilder_.mergeFrom(value); - } - - return this; + @java.lang.Override + public int getRetcode() { + return retcode_; } /** - * .FurnitureMakeSlot furniture_make_slot = 3; + * int32 retcode = 8; + * @param value The retcode to set. + * @return This builder for chaining. */ - public Builder clearFurnitureMakeSlot() { - if (furnitureMakeSlotBuilder_ == null) { - furnitureMakeSlot_ = null; - onChanged(); - } else { - furnitureMakeSlot_ = null; - furnitureMakeSlotBuilder_ = null; - } - + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); return this; } /** - * .FurnitureMakeSlot furniture_make_slot = 3; + * int32 retcode = 8; + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder getFurnitureMakeSlotBuilder() { + public Builder clearRetcode() { + retcode_ = 0; onChanged(); - return getFurnitureMakeSlotFieldBuilder().getBuilder(); - } - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - */ - public emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder getFurnitureMakeSlotOrBuilder() { - if (furnitureMakeSlotBuilder_ != null) { - return furnitureMakeSlotBuilder_.getMessageOrBuilder(); - } else { - return furnitureMakeSlot_ == null ? - emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.getDefaultInstance() : furnitureMakeSlot_; - } - } - /** - * .FurnitureMakeSlot furniture_make_slot = 3; - */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder> - getFurnitureMakeSlotFieldBuilder() { - if (furnitureMakeSlotBuilder_ == null) { - furnitureMakeSlotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlot.Builder, emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.FurnitureMakeSlotOrBuilder>( - getFurnitureMakeSlot(), - getParentForChildren(), - isClean()); - furnitureMakeSlot_ = null; - } - return furnitureMakeSlotBuilder_; + return this; } private java.util.List outputItemList_ = @@ -1191,7 +1374,11 @@ private void ensureOutputItemListIsMutable() { emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> outputItemListBuilder_; /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public java.util.List getOutputItemListList() { if (outputItemListBuilder_ == null) { @@ -1201,7 +1388,11 @@ public java.util.List g } } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public int getOutputItemListCount() { if (outputItemListBuilder_ == null) { @@ -1211,7 +1402,11 @@ public int getOutputItemListCount() { } } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getOutputItemList(int index) { if (outputItemListBuilder_ == null) { @@ -1221,7 +1416,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getOutputItemList } } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder setOutputItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1238,7 +1437,11 @@ public Builder setOutputItemList( return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder setOutputItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1252,7 +1455,11 @@ public Builder setOutputItemList( return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder addOutputItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { if (outputItemListBuilder_ == null) { @@ -1268,7 +1475,11 @@ public Builder addOutputItemList(emu.grasscutter.net.proto.ItemParamOuterClass.I return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder addOutputItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) { @@ -1285,7 +1496,11 @@ public Builder addOutputItemList( return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder addOutputItemList( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1299,7 +1514,11 @@ public Builder addOutputItemList( return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder addOutputItemList( int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) { @@ -1313,7 +1532,11 @@ public Builder addOutputItemList( return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder addAllOutputItemList( java.lang.Iterable values) { @@ -1328,7 +1551,11 @@ public Builder addAllOutputItemList( return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder clearOutputItemList() { if (outputItemListBuilder_ == null) { @@ -1341,7 +1568,11 @@ public Builder clearOutputItemList() { return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public Builder removeOutputItemList(int index) { if (outputItemListBuilder_ == null) { @@ -1354,14 +1585,22 @@ public Builder removeOutputItemList(int index) { return this; } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getOutputItemListBuilder( int index) { return getOutputItemListFieldBuilder().getBuilder(index); } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOutputItemListOrBuilder( int index) { @@ -1371,7 +1610,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOutpu } } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public java.util.List getOutputItemListOrBuilderList() { @@ -1382,14 +1625,22 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOutpu } } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addOutputItemListBuilder() { return getOutputItemListFieldBuilder().addBuilder( emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addOutputItemListBuilder( int index) { @@ -1397,7 +1648,11 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addOutput index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance()); } /** - * repeated .ItemParam output_item_list = 6; + * 
+       * obf: GBEPKGLFBFD 字段可能猜的是错的
+       *
+ * + * repeated .ItemParam output_item_list = 12; */ public java.util.List getOutputItemListBuilderList() { @@ -1448,37 +1703,6 @@ public Builder clearMakeId() { onChanged(); return this; } - - private int retcode_ ; - /** - * int32 retcode = 7; - * @return The retcode. - */ - @java.lang.Override - public int getRetcode() { - return retcode_; - } - /** - * int32 retcode = 7; - * @param value The retcode to set. - * @return This builder for chaining. - */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; - } - /** - * int32 retcode = 7; - * @return This builder for chaining. - */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; - } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1546,29 +1770,29 @@ public emu.grasscutter.net.proto.TakeFurnitureMakeRspOuterClass.TakeFurnitureMak descriptor; static { java.lang.String[] descriptorData = { - "\n\032TakeFurnitureMakeRsp.proto\032\017ItemParam." + - "proto\032\027FurnitureMakeSlot.proto\"\265\001\n\024TakeF" + - "urnitureMakeRsp\022$\n\020return_item_list\030\004 \003(" + - "\0132\n.ItemParam\022/\n\023furniture_make_slot\030\003 \001" + - "(\0132\022.FurnitureMakeSlot\022$\n\020output_item_li" + - "st\030\006 \003(\0132\n.ItemParam\022\017\n\007make_id\030\r \001(\r\022\017\n" + - "\007retcode\030\007 \001(\005B\033\n\031emu.grasscutter.net.pr" + + "\n\032TakeFurnitureMakeRsp.proto\032\027FurnitureM" + + "akeSlot.proto\032\017ItemParam.proto\"\265\001\n\024TakeF" + + "urnitureMakeRsp\022/\n\023furniture_make_slot\030\003" + + " \001(\0132\022.FurnitureMakeSlot\022$\n\020return_item_" + + "list\030\006 \003(\0132\n.ItemParam\022\017\n\007retcode\030\010 \001(\005\022" + + "$\n\020output_item_list\030\014 \003(\0132\n.ItemParam\022\017\n" + + "\007make_id\030\r \001(\rB\033\n\031emu.grasscutter.net.pr" + "otob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(), emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.getDescriptor(), + emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(), }); internal_static_TakeFurnitureMakeRsp_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_TakeFurnitureMakeRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TakeFurnitureMakeRsp_descriptor, - new java.lang.String[] { "ReturnItemList", "FurnitureMakeSlot", "OutputItemList", "MakeId", "Retcode", }); - emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); + new java.lang.String[] { "FurnitureMakeSlot", "ReturnItemList", "Retcode", "OutputItemList", "MakeId", }); emu.grasscutter.net.proto.FurnitureMakeSlotOuterClass.getDescriptor(); + emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardReqOuterClass.java index 8c86300245d..b3d0c03358a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardReqOuterClass.java @@ -27,6 +27,7 @@ public interface TakePlayerLevelRewardReqOrBuilder extends /** * 
    * CmdId: 9556
+   * obf: HDJLLFNAIAE
    *
* * Protobuf type {@code TakePlayerLevelRewardReq} @@ -279,6 +280,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 9556
+     * obf: HDJLLFNAIAE
      *
* * Protobuf type {@code TakePlayerLevelRewardReq} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardRspOuterClass.java index 384e25c0414..fc42b648659 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardRspOuterClass.java @@ -39,6 +39,7 @@ public interface TakePlayerLevelRewardRspOrBuilder extends /** * 
    * CmdId: 21700
+   * obf: IIHHMMIJPAP
    *
* * Protobuf type {@code TakePlayerLevelRewardRsp} @@ -345,6 +346,7 @@ protected Builder newBuilderForType( /** * 
      * CmdId: 21700
+     * obf: IIHHMMIJPAP
      *
* * Protobuf type {@code TakePlayerLevelRewardRsp} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipReqOuterClass.java index b55209f749c..a8670003fed 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipReqOuterClass.java @@ -19,21 +19,21 @@ public interface TakeoffEquipReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 slot = 14; + * uint32 slot = 3; * @return The slot. */ int getSlot(); /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 13; * @return The avatarGuid. */ long getAvatarGuid(); } /** * 
-   * CmdId: 23894
-   * Obf: MGOICFILCBB
+   * CmdId: 24083
+   * obf: JNNHDMHPPCN
    *
* * Protobuf type {@code TakeoffEquipReq} @@ -80,14 +80,14 @@ private TakeoffEquipReq( case 0: done = true; break; - case 40: { + case 24: { - avatarGuid_ = input.readUInt64(); + slot_ = input.readUInt32(); break; } - case 112: { + case 104: { - slot_ = input.readUInt32(); + avatarGuid_ = input.readUInt64(); break; } default: { @@ -122,10 +122,10 @@ private TakeoffEquipReq( emu.grasscutter.net.proto.TakeoffEquipReqOuterClass.TakeoffEquipReq.class, emu.grasscutter.net.proto.TakeoffEquipReqOuterClass.TakeoffEquipReq.Builder.class); } - public static final int SLOT_FIELD_NUMBER = 14; + public static final int SLOT_FIELD_NUMBER = 3; private int slot_; /** - * uint32 slot = 14; + * uint32 slot = 3; * @return The slot. */ @java.lang.Override @@ -133,10 +133,10 @@ public int getSlot() { return slot_; } - public static final int AVATAR_GUID_FIELD_NUMBER = 5; + public static final int AVATAR_GUID_FIELD_NUMBER = 13; private long avatarGuid_; /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 13; * @return The avatarGuid. */ @java.lang.Override @@ -158,11 +158,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (avatarGuid_ != 0L) { - output.writeUInt64(5, avatarGuid_); - } if (slot_ != 0) { - output.writeUInt32(14, slot_); + output.writeUInt32(3, slot_); + } + if (avatarGuid_ != 0L) { + output.writeUInt64(13, avatarGuid_); } unknownFields.writeTo(output); } @@ -173,13 +173,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (avatarGuid_ != 0L) { + if (slot_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(5, avatarGuid_); + .computeUInt32Size(3, slot_); } - if (slot_ != 0) { + if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, slot_); + .computeUInt64Size(13, avatarGuid_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -313,8 +313,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23894
-     * Obf: MGOICFILCBB
+     * CmdId: 24083
+     * obf: JNNHDMHPPCN
      *
* * Protobuf type {@code TakeoffEquipReq} @@ -471,7 +471,7 @@ public Builder mergeFrom( private int slot_ ; /** - * uint32 slot = 14; + * uint32 slot = 3; * @return The slot. */ @java.lang.Override @@ -479,7 +479,7 @@ public int getSlot() { return slot_; } /** - * uint32 slot = 14; + * uint32 slot = 3; * @param value The slot to set. * @return This builder for chaining. */ @@ -490,7 +490,7 @@ public Builder setSlot(int value) { return this; } /** - * uint32 slot = 14; + * uint32 slot = 3; * @return This builder for chaining. */ public Builder clearSlot() { @@ -502,7 +502,7 @@ public Builder clearSlot() { private long avatarGuid_ ; /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 13; * @return The avatarGuid. */ @java.lang.Override @@ -510,7 +510,7 @@ public long getAvatarGuid() { return avatarGuid_; } /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 13; * @param value The avatarGuid to set. * @return This builder for chaining. */ @@ -521,7 +521,7 @@ public Builder setAvatarGuid(long value) { return this; } /** - * uint64 avatar_guid = 5; + * uint64 avatar_guid = 13; * @return This builder for chaining. */ public Builder clearAvatarGuid() { @@ -598,7 +598,7 @@ public emu.grasscutter.net.proto.TakeoffEquipReqOuterClass.TakeoffEquipReq getDe static { java.lang.String[] descriptorData = { "\n\025TakeoffEquipReq.proto\"4\n\017TakeoffEquipR" + - "eq\022\014\n\004slot\030\016 \001(\r\022\023\n\013avatar_guid\030\005 \001(\004B\033\n" + + "eq\022\014\n\004slot\030\003 \001(\r\022\023\n\013avatar_guid\030\r \001(\004B\033\n" + "\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipRspOuterClass.java index e666a3912c7..bd8b6894ada 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeoffEquipRspOuterClass.java @@ -25,21 +25,21 @@ public interface TakeoffEquipRspOrBuilder extends long getAvatarGuid(); /** - * uint32 slot = 12; - * @return The slot. + * int32 retcode = 14; + * @return The retcode. */ - int getSlot(); + int getRetcode(); /** - * int32 retcode = 15; - * @return The retcode. + * uint32 slot = 15; + * @return The slot. */ - int getRetcode(); + int getSlot(); } /** * 
-   * CmdId: 24431
-   * Obf: IPGHDPELLAL
+   * CmdId: 7489
+   * obf: PFGLFPKIIPA
    *
* * Protobuf type {@code TakeoffEquipRsp} @@ -86,19 +86,19 @@ private TakeoffEquipRsp( case 0: done = true; break; - case 96: { + case 104: { - slot_ = input.readUInt32(); + avatarGuid_ = input.readUInt64(); break; } - case 104: { + case 112: { - avatarGuid_ = input.readUInt64(); + retcode_ = input.readInt32(); break; } case 120: { - retcode_ = input.readInt32(); + slot_ = input.readUInt32(); break; } default: { @@ -144,26 +144,26 @@ public long getAvatarGuid() { return avatarGuid_; } - public static final int SLOT_FIELD_NUMBER = 12; - private int slot_; + public static final int RETCODE_FIELD_NUMBER = 14; + private int retcode_; /** - * uint32 slot = 12; - * @return The slot. + * int32 retcode = 14; + * @return The retcode. */ @java.lang.Override - public int getSlot() { - return slot_; + public int getRetcode() { + return retcode_; } - public static final int RETCODE_FIELD_NUMBER = 15; - private int retcode_; + public static final int SLOT_FIELD_NUMBER = 15; + private int slot_; /** - * int32 retcode = 15; - * @return The retcode. + * uint32 slot = 15; + * @return The slot. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getSlot() { + return slot_; } private byte memoizedIsInitialized = -1; @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (slot_ != 0) { - output.writeUInt32(12, slot_); - } if (avatarGuid_ != 0L) { output.writeUInt64(13, avatarGuid_); } if (retcode_ != 0) { - output.writeInt32(15, retcode_); + output.writeInt32(14, retcode_); + } + if (slot_ != 0) { + output.writeUInt32(15, slot_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (slot_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, slot_); - } if (avatarGuid_ != 0L) { size += com.google.protobuf.CodedOutputStream .computeUInt64Size(13, avatarGuid_); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(15, retcode_); + .computeInt32Size(14, retcode_); + } + if (slot_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(15, slot_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -227,10 +227,10 @@ public boolean equals(final java.lang.Object obj) { if (getAvatarGuid() != other.getAvatarGuid()) return false; - if (getSlot() - != other.getSlot()) return false; if (getRetcode() != other.getRetcode()) return false; + if (getSlot() + != other.getSlot()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -245,10 +245,10 @@ public int hashCode() { hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getAvatarGuid()); - hash = (37 * hash) + SLOT_FIELD_NUMBER; - hash = (53 * hash) + getSlot(); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); + hash = (37 * hash) + SLOT_FIELD_NUMBER; + hash = (53 * hash) + getSlot(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -346,8 +346,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 24431
-     * Obf: IPGHDPELLAL
+     * CmdId: 7489
+     * obf: PFGLFPKIIPA
      *
* * Protobuf type {@code TakeoffEquipRsp} @@ -389,10 +389,10 @@ public Builder clear() { super.clear(); avatarGuid_ = 0L; - slot_ = 0; - retcode_ = 0; + slot_ = 0; + return this; } @@ -420,8 +420,8 @@ public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp build public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp buildPartial() { emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp result = new emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp(this); result.avatarGuid_ = avatarGuid_; - result.slot_ = slot_; result.retcode_ = retcode_; + result.slot_ = slot_; onBuilt(); return result; } @@ -473,12 +473,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.Tak if (other.getAvatarGuid() != 0L) { setAvatarGuid(other.getAvatarGuid()); } - if (other.getSlot() != 0) { - setSlot(other.getSlot()); - } if (other.getRetcode() != 0) { setRetcode(other.getRetcode()); } + if (other.getSlot() != 0) { + setSlot(other.getSlot()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -539,64 +539,64 @@ public Builder clearAvatarGuid() { return this; } - private int slot_ ; + private int retcode_ ; /** - * uint32 slot = 12; - * @return The slot. + * int32 retcode = 14; + * @return The retcode. */ @java.lang.Override - public int getSlot() { - return slot_; + public int getRetcode() { + return retcode_; } /** - * uint32 slot = 12; - * @param value The slot to set. + * int32 retcode = 14; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setSlot(int value) { + public Builder setRetcode(int value) { - slot_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 slot = 12; + * int32 retcode = 14; * @return This builder for chaining. */ - public Builder clearSlot() { + public Builder clearRetcode() { - slot_ = 0; + retcode_ = 0; onChanged(); return this; } - private int retcode_ ; + private int slot_ ; /** - * int32 retcode = 15; - * @return The retcode. + * uint32 slot = 15; + * @return The slot. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getSlot() { + return slot_; } /** - * int32 retcode = 15; - * @param value The retcode to set. + * uint32 slot = 15; + * @param value The slot to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setSlot(int value) { - retcode_ = value; + slot_ = value; onChanged(); return this; } /** - * int32 retcode = 15; + * uint32 slot = 15; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearSlot() { - retcode_ = 0; + slot_ = 0; onChanged(); return this; } @@ -668,8 +668,8 @@ public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp getDe static { java.lang.String[] descriptorData = { "\n\025TakeoffEquipRsp.proto\"E\n\017TakeoffEquipR" + - "sp\022\023\n\013avatar_guid\030\r \001(\004\022\014\n\004slot\030\014 \001(\r\022\017\n" + - "\007retcode\030\017 \001(\005B\033\n\031emu.grasscutter.net.pr" + + "sp\022\023\n\013avatar_guid\030\r \001(\004\022\017\n\007retcode\030\016 \001(\005" + + "\022\014\n\004slot\030\017 \001(\rB\033\n\031emu.grasscutter.net.pr" + "otob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -681,7 +681,7 @@ public emu.grasscutter.net.proto.TakeoffEquipRspOuterClass.TakeoffEquipRsp getDe internal_static_TakeoffEquipRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TakeoffEquipRsp_descriptor, - new java.lang.String[] { "AvatarGuid", "Slot", "Retcode", }); + new java.lang.String[] { "AvatarGuid", "Retcode", "Slot", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TeamChainSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TeamChainSettleInfoOuterClass.java index c901fe373fb..9de4441be42 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TeamChainSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TeamChainSettleInfoOuterClass.java @@ -19,51 +19,47 @@ public interface TeamChainSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 score_list = 3; - * @return A list containing the scoreList. + * repeated uint32 KNBIFCCIBLE = 1; + * @return A list containing the kNBIFCCIBLE. */ - java.util.List getScoreListList(); + java.util.List getKNBIFCCIBLEList(); /** - * repeated uint32 score_list = 3; - * @return The count of scoreList. + * repeated uint32 KNBIFCCIBLE = 1; + * @return The count of kNBIFCCIBLE. */ - int getScoreListCount(); + int getKNBIFCCIBLECount(); /** - * repeated uint32 score_list = 3; + * repeated uint32 KNBIFCCIBLE = 1; * @param index The index of the element to return. - * @return The scoreList at the given index. + * @return The kNBIFCCIBLE at the given index. */ - int getScoreList(int index); + int getKNBIFCCIBLE(int index); /** - * uint32 difficulty = 15; - * @return The difficulty. + * bool is_new_record = 6; + * @return The isNewRecord. */ - int getDifficulty(); + boolean getIsNewRecord(); /** - * uint32 total_score = 6; - * @return The totalScore. + * uint32 NNAALGJOAIO = 12; + * @return The nNAALGJOAIO. */ - int getTotalScore(); + int getNNAALGJOAIO(); /** - * bool is_new_record = 9; - * @return The isNewRecord. + * uint32 MEMPKCGNNMF = 13; + * @return The mEMPKCGNNMF. */ - boolean getIsNewRecord(); + int getMEMPKCGNNMF(); /** - * uint32 stage_id = 10; - * @return The stageId. + * uint32 DMNLDPPGOKG = 15; + * @return The dMNLDPPGOKG. */ - int getStageId(); + int getDMNLDPPGOKG(); } /** - * 
-   * Obf: LLNMBEJEOMH
-   *
- * * Protobuf type {@code TeamChainSettleInfo} */ public static final class TeamChainSettleInfo extends @@ -76,7 +72,7 @@ private TeamChainSettleInfo(com.google.protobuf.GeneratedMessageV3.Builder bu super(builder); } private TeamChainSettleInfo() { - scoreList_ = emptyIntList(); + kNBIFCCIBLE_ = emptyIntList(); } @java.lang.Override @@ -110,45 +106,45 @@ private TeamChainSettleInfo( case 0: done = true; break; - case 24: { + case 8: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - scoreList_ = newIntList(); + kNBIFCCIBLE_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - scoreList_.addInt(input.readUInt32()); + kNBIFCCIBLE_.addInt(input.readUInt32()); break; } - case 26: { + case 10: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - scoreList_ = newIntList(); + kNBIFCCIBLE_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - scoreList_.addInt(input.readUInt32()); + kNBIFCCIBLE_.addInt(input.readUInt32()); } input.popLimit(limit); break; } case 48: { - totalScore_ = input.readUInt32(); + isNewRecord_ = input.readBool(); break; } - case 72: { + case 96: { - isNewRecord_ = input.readBool(); + nNAALGJOAIO_ = input.readUInt32(); break; } - case 80: { + case 104: { - stageId_ = input.readUInt32(); + mEMPKCGNNMF_ = input.readUInt32(); break; } case 120: { - difficulty_ = input.readUInt32(); + dMNLDPPGOKG_ = input.readUInt32(); break; } default: { @@ -167,7 +163,7 @@ private TeamChainSettleInfo( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - scoreList_.makeImmutable(); // C + kNBIFCCIBLE_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -186,76 +182,76 @@ private TeamChainSettleInfo( emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.class, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder.class); } - public static final int SCORE_LIST_FIELD_NUMBER = 3; - private com.google.protobuf.Internal.IntList scoreList_; + public static final int KNBIFCCIBLE_FIELD_NUMBER = 1; + private com.google.protobuf.Internal.IntList kNBIFCCIBLE_; /** - * repeated uint32 score_list = 3; - * @return A list containing the scoreList. + * repeated uint32 KNBIFCCIBLE = 1; + * @return A list containing the kNBIFCCIBLE. */ @java.lang.Override public java.util.List - getScoreListList() { - return scoreList_; + getKNBIFCCIBLEList() { + return kNBIFCCIBLE_; } /** - * repeated uint32 score_list = 3; - * @return The count of scoreList. + * repeated uint32 KNBIFCCIBLE = 1; + * @return The count of kNBIFCCIBLE. */ - public int getScoreListCount() { - return scoreList_.size(); + public int getKNBIFCCIBLECount() { + return kNBIFCCIBLE_.size(); } /** - * repeated uint32 score_list = 3; + * repeated uint32 KNBIFCCIBLE = 1; * @param index The index of the element to return. - * @return The scoreList at the given index. + * @return The kNBIFCCIBLE at the given index. */ - public int getScoreList(int index) { - return scoreList_.getInt(index); + public int getKNBIFCCIBLE(int index) { + return kNBIFCCIBLE_.getInt(index); } - private int scoreListMemoizedSerializedSize = -1; + private int kNBIFCCIBLEMemoizedSerializedSize = -1; - public static final int DIFFICULTY_FIELD_NUMBER = 15; - private int difficulty_; + public static final int IS_NEW_RECORD_FIELD_NUMBER = 6; + private boolean isNewRecord_; /** - * uint32 difficulty = 15; - * @return The difficulty. + * bool is_new_record = 6; + * @return The isNewRecord. */ @java.lang.Override - public int getDifficulty() { - return difficulty_; + public boolean getIsNewRecord() { + return isNewRecord_; } - public static final int TOTAL_SCORE_FIELD_NUMBER = 6; - private int totalScore_; + public static final int NNAALGJOAIO_FIELD_NUMBER = 12; + private int nNAALGJOAIO_; /** - * uint32 total_score = 6; - * @return The totalScore. + * uint32 NNAALGJOAIO = 12; + * @return The nNAALGJOAIO. */ @java.lang.Override - public int getTotalScore() { - return totalScore_; + public int getNNAALGJOAIO() { + return nNAALGJOAIO_; } - public static final int IS_NEW_RECORD_FIELD_NUMBER = 9; - private boolean isNewRecord_; + public static final int MEMPKCGNNMF_FIELD_NUMBER = 13; + private int mEMPKCGNNMF_; /** - * bool is_new_record = 9; - * @return The isNewRecord. + * uint32 MEMPKCGNNMF = 13; + * @return The mEMPKCGNNMF. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getMEMPKCGNNMF() { + return mEMPKCGNNMF_; } - public static final int STAGE_ID_FIELD_NUMBER = 10; - private int stageId_; + public static final int DMNLDPPGOKG_FIELD_NUMBER = 15; + private int dMNLDPPGOKG_; /** - * uint32 stage_id = 10; - * @return The stageId. + * uint32 DMNLDPPGOKG = 15; + * @return The dMNLDPPGOKG. */ @java.lang.Override - public int getStageId() { - return stageId_; + public int getDMNLDPPGOKG() { + return dMNLDPPGOKG_; } private byte memoizedIsInitialized = -1; @@ -273,24 +269,24 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (getScoreListList().size() > 0) { - output.writeUInt32NoTag(26); - output.writeUInt32NoTag(scoreListMemoizedSerializedSize); + if (getKNBIFCCIBLEList().size() > 0) { + output.writeUInt32NoTag(10); + output.writeUInt32NoTag(kNBIFCCIBLEMemoizedSerializedSize); } - for (int i = 0; i < scoreList_.size(); i++) { - output.writeUInt32NoTag(scoreList_.getInt(i)); - } - if (totalScore_ != 0) { - output.writeUInt32(6, totalScore_); + for (int i = 0; i < kNBIFCCIBLE_.size(); i++) { + output.writeUInt32NoTag(kNBIFCCIBLE_.getInt(i)); } if (isNewRecord_ != false) { - output.writeBool(9, isNewRecord_); + output.writeBool(6, isNewRecord_); + } + if (nNAALGJOAIO_ != 0) { + output.writeUInt32(12, nNAALGJOAIO_); } - if (stageId_ != 0) { - output.writeUInt32(10, stageId_); + if (mEMPKCGNNMF_ != 0) { + output.writeUInt32(13, mEMPKCGNNMF_); } - if (difficulty_ != 0) { - output.writeUInt32(15, difficulty_); + if (dMNLDPPGOKG_ != 0) { + output.writeUInt32(15, dMNLDPPGOKG_); } unknownFields.writeTo(output); } @@ -303,33 +299,33 @@ public int getSerializedSize() { size = 0; { int dataSize = 0; - for (int i = 0; i < scoreList_.size(); i++) { + for (int i = 0; i < kNBIFCCIBLE_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(scoreList_.getInt(i)); + .computeUInt32SizeNoTag(kNBIFCCIBLE_.getInt(i)); } size += dataSize; - if (!getScoreListList().isEmpty()) { + if (!getKNBIFCCIBLEList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - scoreListMemoizedSerializedSize = dataSize; + kNBIFCCIBLEMemoizedSerializedSize = dataSize; } - if (totalScore_ != 0) { + if (isNewRecord_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, totalScore_); + .computeBoolSize(6, isNewRecord_); } - if (isNewRecord_ != false) { + if (nNAALGJOAIO_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(9, isNewRecord_); + .computeUInt32Size(12, nNAALGJOAIO_); } - if (stageId_ != 0) { + if (mEMPKCGNNMF_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, stageId_); + .computeUInt32Size(13, mEMPKCGNNMF_); } - if (difficulty_ != 0) { + if (dMNLDPPGOKG_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, difficulty_); + .computeUInt32Size(15, dMNLDPPGOKG_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -346,16 +342,16 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo other = (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) obj; - if (!getScoreListList() - .equals(other.getScoreListList())) return false; - if (getDifficulty() - != other.getDifficulty()) return false; - if (getTotalScore() - != other.getTotalScore()) return false; + if (!getKNBIFCCIBLEList() + .equals(other.getKNBIFCCIBLEList())) return false; if (getIsNewRecord() != other.getIsNewRecord()) return false; - if (getStageId() - != other.getStageId()) return false; + if (getNNAALGJOAIO() + != other.getNNAALGJOAIO()) return false; + if (getMEMPKCGNNMF() + != other.getMEMPKCGNNMF()) return false; + if (getDMNLDPPGOKG() + != other.getDMNLDPPGOKG()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -367,19 +363,19 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getScoreListCount() > 0) { - hash = (37 * hash) + SCORE_LIST_FIELD_NUMBER; - hash = (53 * hash) + getScoreListList().hashCode(); - } - hash = (37 * hash) + DIFFICULTY_FIELD_NUMBER; - hash = (53 * hash) + getDifficulty(); - hash = (37 * hash) + TOTAL_SCORE_FIELD_NUMBER; - hash = (53 * hash) + getTotalScore(); + if (getKNBIFCCIBLECount() > 0) { + hash = (37 * hash) + KNBIFCCIBLE_FIELD_NUMBER; + hash = (53 * hash) + getKNBIFCCIBLEList().hashCode(); + } hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsNewRecord()); - hash = (37 * hash) + STAGE_ID_FIELD_NUMBER; - hash = (53 * hash) + getStageId(); + hash = (37 * hash) + NNAALGJOAIO_FIELD_NUMBER; + hash = (53 * hash) + getNNAALGJOAIO(); + hash = (37 * hash) + MEMPKCGNNMF_FIELD_NUMBER; + hash = (53 * hash) + getMEMPKCGNNMF(); + hash = (37 * hash) + DMNLDPPGOKG_FIELD_NUMBER; + hash = (53 * hash) + getDMNLDPPGOKG(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -476,10 +472,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: LLNMBEJEOMH
-     *
- * * Protobuf type {@code TeamChainSettleInfo} */ public static final class Builder extends @@ -517,15 +509,15 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - scoreList_ = emptyIntList(); + kNBIFCCIBLE_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - difficulty_ = 0; + isNewRecord_ = false; - totalScore_ = 0; + nNAALGJOAIO_ = 0; - isNewRecord_ = false; + mEMPKCGNNMF_ = 0; - stageId_ = 0; + dMNLDPPGOKG_ = 0; return this; } @@ -555,14 +547,14 @@ public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleIn emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo result = new emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) != 0)) { - scoreList_.makeImmutable(); + kNBIFCCIBLE_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.scoreList_ = scoreList_; - result.difficulty_ = difficulty_; - result.totalScore_ = totalScore_; + result.kNBIFCCIBLE_ = kNBIFCCIBLE_; result.isNewRecord_ = isNewRecord_; - result.stageId_ = stageId_; + result.nNAALGJOAIO_ = nNAALGJOAIO_; + result.mEMPKCGNNMF_ = mEMPKCGNNMF_; + result.dMNLDPPGOKG_ = dMNLDPPGOKG_; onBuilt(); return result; } @@ -611,27 +603,27 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo other) { if (other == emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance()) return this; - if (!other.scoreList_.isEmpty()) { - if (scoreList_.isEmpty()) { - scoreList_ = other.scoreList_; + if (!other.kNBIFCCIBLE_.isEmpty()) { + if (kNBIFCCIBLE_.isEmpty()) { + kNBIFCCIBLE_ = other.kNBIFCCIBLE_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureScoreListIsMutable(); - scoreList_.addAll(other.scoreList_); + ensureKNBIFCCIBLEIsMutable(); + kNBIFCCIBLE_.addAll(other.kNBIFCCIBLE_); } onChanged(); } - if (other.getDifficulty() != 0) { - setDifficulty(other.getDifficulty()); - } - if (other.getTotalScore() != 0) { - setTotalScore(other.getTotalScore()); - } if (other.getIsNewRecord() != false) { setIsNewRecord(other.getIsNewRecord()); } - if (other.getStageId() != 0) { - setStageId(other.getStageId()); + if (other.getNNAALGJOAIO() != 0) { + setNNAALGJOAIO(other.getNNAALGJOAIO()); + } + if (other.getMEMPKCGNNMF() != 0) { + setMEMPKCGNNMF(other.getMEMPKCGNNMF()); + } + if (other.getDMNLDPPGOKG() != 0) { + setDMNLDPPGOKG(other.getDMNLDPPGOKG()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -663,205 +655,205 @@ public Builder mergeFrom( } private int bitField0_; - private com.google.protobuf.Internal.IntList scoreList_ = emptyIntList(); - private void ensureScoreListIsMutable() { + private com.google.protobuf.Internal.IntList kNBIFCCIBLE_ = emptyIntList(); + private void ensureKNBIFCCIBLEIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - scoreList_ = mutableCopy(scoreList_); + kNBIFCCIBLE_ = mutableCopy(kNBIFCCIBLE_); bitField0_ |= 0x00000001; } } /** - * repeated uint32 score_list = 3; - * @return A list containing the scoreList. + * repeated uint32 KNBIFCCIBLE = 1; + * @return A list containing the kNBIFCCIBLE. */ public java.util.List - getScoreListList() { + getKNBIFCCIBLEList() { return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(scoreList_) : scoreList_; + java.util.Collections.unmodifiableList(kNBIFCCIBLE_) : kNBIFCCIBLE_; } /** - * repeated uint32 score_list = 3; - * @return The count of scoreList. + * repeated uint32 KNBIFCCIBLE = 1; + * @return The count of kNBIFCCIBLE. */ - public int getScoreListCount() { - return scoreList_.size(); + public int getKNBIFCCIBLECount() { + return kNBIFCCIBLE_.size(); } /** - * repeated uint32 score_list = 3; + * repeated uint32 KNBIFCCIBLE = 1; * @param index The index of the element to return. - * @return The scoreList at the given index. + * @return The kNBIFCCIBLE at the given index. */ - public int getScoreList(int index) { - return scoreList_.getInt(index); + public int getKNBIFCCIBLE(int index) { + return kNBIFCCIBLE_.getInt(index); } /** - * repeated uint32 score_list = 3; + * repeated uint32 KNBIFCCIBLE = 1; * @param index The index to set the value at. - * @param value The scoreList to set. + * @param value The kNBIFCCIBLE to set. * @return This builder for chaining. */ - public Builder setScoreList( + public Builder setKNBIFCCIBLE( int index, int value) { - ensureScoreListIsMutable(); - scoreList_.setInt(index, value); + ensureKNBIFCCIBLEIsMutable(); + kNBIFCCIBLE_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 score_list = 3; - * @param value The scoreList to add. + * repeated uint32 KNBIFCCIBLE = 1; + * @param value The kNBIFCCIBLE to add. * @return This builder for chaining. */ - public Builder addScoreList(int value) { - ensureScoreListIsMutable(); - scoreList_.addInt(value); + public Builder addKNBIFCCIBLE(int value) { + ensureKNBIFCCIBLEIsMutable(); + kNBIFCCIBLE_.addInt(value); onChanged(); return this; } /** - * repeated uint32 score_list = 3; - * @param values The scoreList to add. + * repeated uint32 KNBIFCCIBLE = 1; + * @param values The kNBIFCCIBLE to add. * @return This builder for chaining. */ - public Builder addAllScoreList( + public Builder addAllKNBIFCCIBLE( java.lang.Iterable values) { - ensureScoreListIsMutable(); + ensureKNBIFCCIBLEIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, scoreList_); + values, kNBIFCCIBLE_); onChanged(); return this; } /** - * repeated uint32 score_list = 3; + * repeated uint32 KNBIFCCIBLE = 1; * @return This builder for chaining. */ - public Builder clearScoreList() { - scoreList_ = emptyIntList(); + public Builder clearKNBIFCCIBLE() { + kNBIFCCIBLE_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } - private int difficulty_ ; + private boolean isNewRecord_ ; /** - * uint32 difficulty = 15; - * @return The difficulty. + * bool is_new_record = 6; + * @return The isNewRecord. */ @java.lang.Override - public int getDifficulty() { - return difficulty_; + public boolean getIsNewRecord() { + return isNewRecord_; } /** - * uint32 difficulty = 15; - * @param value The difficulty to set. + * bool is_new_record = 6; + * @param value The isNewRecord to set. * @return This builder for chaining. */ - public Builder setDifficulty(int value) { + public Builder setIsNewRecord(boolean value) { - difficulty_ = value; + isNewRecord_ = value; onChanged(); return this; } /** - * uint32 difficulty = 15; + * bool is_new_record = 6; * @return This builder for chaining. */ - public Builder clearDifficulty() { + public Builder clearIsNewRecord() { - difficulty_ = 0; + isNewRecord_ = false; onChanged(); return this; } - private int totalScore_ ; + private int nNAALGJOAIO_ ; /** - * uint32 total_score = 6; - * @return The totalScore. + * uint32 NNAALGJOAIO = 12; + * @return The nNAALGJOAIO. */ @java.lang.Override - public int getTotalScore() { - return totalScore_; + public int getNNAALGJOAIO() { + return nNAALGJOAIO_; } /** - * uint32 total_score = 6; - * @param value The totalScore to set. + * uint32 NNAALGJOAIO = 12; + * @param value The nNAALGJOAIO to set. * @return This builder for chaining. */ - public Builder setTotalScore(int value) { + public Builder setNNAALGJOAIO(int value) { - totalScore_ = value; + nNAALGJOAIO_ = value; onChanged(); return this; } /** - * uint32 total_score = 6; + * uint32 NNAALGJOAIO = 12; * @return This builder for chaining. */ - public Builder clearTotalScore() { + public Builder clearNNAALGJOAIO() { - totalScore_ = 0; + nNAALGJOAIO_ = 0; onChanged(); return this; } - private boolean isNewRecord_ ; + private int mEMPKCGNNMF_ ; /** - * bool is_new_record = 9; - * @return The isNewRecord. + * uint32 MEMPKCGNNMF = 13; + * @return The mEMPKCGNNMF. */ @java.lang.Override - public boolean getIsNewRecord() { - return isNewRecord_; + public int getMEMPKCGNNMF() { + return mEMPKCGNNMF_; } /** - * bool is_new_record = 9; - * @param value The isNewRecord to set. + * uint32 MEMPKCGNNMF = 13; + * @param value The mEMPKCGNNMF to set. * @return This builder for chaining. */ - public Builder setIsNewRecord(boolean value) { + public Builder setMEMPKCGNNMF(int value) { - isNewRecord_ = value; + mEMPKCGNNMF_ = value; onChanged(); return this; } /** - * bool is_new_record = 9; + * uint32 MEMPKCGNNMF = 13; * @return This builder for chaining. */ - public Builder clearIsNewRecord() { + public Builder clearMEMPKCGNNMF() { - isNewRecord_ = false; + mEMPKCGNNMF_ = 0; onChanged(); return this; } - private int stageId_ ; + private int dMNLDPPGOKG_ ; /** - * uint32 stage_id = 10; - * @return The stageId. + * uint32 DMNLDPPGOKG = 15; + * @return The dMNLDPPGOKG. */ @java.lang.Override - public int getStageId() { - return stageId_; + public int getDMNLDPPGOKG() { + return dMNLDPPGOKG_; } /** - * uint32 stage_id = 10; - * @param value The stageId to set. + * uint32 DMNLDPPGOKG = 15; + * @param value The dMNLDPPGOKG to set. * @return This builder for chaining. */ - public Builder setStageId(int value) { + public Builder setDMNLDPPGOKG(int value) { - stageId_ = value; + dMNLDPPGOKG_ = value; onChanged(); return this; } /** - * uint32 stage_id = 10; + * uint32 DMNLDPPGOKG = 15; * @return This builder for chaining. */ - public Builder clearStageId() { + public Builder clearDMNLDPPGOKG() { - stageId_ = 0; + dMNLDPPGOKG_ = 0; onChanged(); return this; } @@ -932,11 +924,11 @@ public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleIn descriptor; static { java.lang.String[] descriptorData = { - "\n\031TeamChainSettleInfo.proto\"{\n\023TeamChain" + - "SettleInfo\022\022\n\nscore_list\030\003 \003(\r\022\022\n\ndiffic" + - "ulty\030\017 \001(\r\022\023\n\013total_score\030\006 \001(\r\022\025\n\ris_ne" + - "w_record\030\t \001(\010\022\020\n\010stage_id\030\n \001(\rB\033\n\031emu." + - "grasscutter.net.protob\006proto3" + "\n\031TeamChainSettleInfo.proto\"\200\001\n\023TeamChai" + + "nSettleInfo\022\023\n\013KNBIFCCIBLE\030\001 \003(\r\022\025\n\ris_n" + + "ew_record\030\006 \001(\010\022\023\n\013NNAALGJOAIO\030\014 \001(\r\022\023\n\013" + + "MEMPKCGNNMF\030\r \001(\r\022\023\n\013DMNLDPPGOKG\030\017 \001(\rB\033" + + "\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -947,7 +939,7 @@ public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleIn internal_static_TeamChainSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TeamChainSettleInfo_descriptor, - new java.lang.String[] { "ScoreList", "Difficulty", "TotalScore", "IsNewRecord", "StageId", }); + new java.lang.String[] { "KNBIFCCIBLE", "IsNewRecord", "NNAALGJOAIO", "MEMPKCGNNMF", "DMNLDPPGOKG", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataReqOuterClass.java index 988b488631f..919d0f4f251 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataReqOuterClass.java @@ -25,6 +25,10 @@ public interface TowerAllDataReqOrBuilder extends boolean getIsInteract(); } /** + * 
+   * CmdId: 2265
+   *
+ * * Protobuf type {@code TowerAllDataReq} */ public static final class TowerAllDataReq extends @@ -274,6 +278,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 2265
+     *
+ * * Protobuf type {@code TowerAllDataReq} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataRspOuterClass.java index 995a69b2216..7bbc3d52c86 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataRspOuterClass.java @@ -19,107 +19,93 @@ public interface TowerAllDataRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * bool is_finished_entrance_floor = 12; - * @return The isFinishedEntranceFloor. + * uint32 next_schedule_change_time = 1; + * @return The nextScheduleChangeTime. */ - boolean getIsFinishedEntranceFloor(); + int getNextScheduleChangeTime(); /** - * uint32 schedule_start_time = 1168; - * @return The scheduleStartTime. + * .TowerCurLevelRecord cur_level_record = 2; + * @return Whether the curLevelRecord field is set. */ - int getScheduleStartTime(); - + boolean hasCurLevelRecord(); /** - * uint32 FEOKMKFLOFI = 6; - * @return The fEOKMKFLOFI. + * .TowerCurLevelRecord cur_level_record = 2; + * @return The curLevelRecord. */ - int getFEOKMKFLOFI(); - + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord getCurLevelRecord(); /** - * uint32 CFHPLJKKOFG = 15; - * @return The cFHPLJKKOFG. + * .TowerCurLevelRecord cur_level_record = 2; */ - int getCFHPLJKKOFG(); + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder(); /** - * uint32 NFLJLHDCPFJ = 5; - * @return The nFLJLHDCPFJ. + * uint32 LICMPIDMCOI = 3; + * @return The lICMPIDMCOI. */ - int getNFLJLHDCPFJ(); + int getLICMPIDMCOI(); /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - java.util.List - getTowerFloorRecordListList(); + int getSkipFloorGrantedRewardItemMapCount(); /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index); + boolean containsSkipFloorGrantedRewardItemMap( + int key); /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * Use {@link #getSkipFloorGrantedRewardItemMapMap()} instead. */ - int getTowerFloorRecordListCount(); + @java.lang.Deprecated + java.util.Map + getSkipFloorGrantedRewardItemMap(); /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - java.util.List - getTowerFloorRecordListOrBuilderList(); + java.util.Map + getSkipFloorGrantedRewardItemMapMap(); /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( - int index); + int getSkipFloorGrantedRewardItemMapOrDefault( + int key, + int defaultValue); /** - * uint32 JJJCPHMBMLG = 9; - * @return The jJJCPHMBMLG. + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - int getJJJCPHMBMLG(); - /** - * bool is_first_interact = 7; - * @return The isFirstInteract. - */ - boolean getIsFirstInteract(); + int getSkipFloorGrantedRewardItemMapOrThrow( + int key); /** - * .TowerCurLevelRecord cur_level_record = 10; - * @return Whether the curLevelRecord field is set. - */ - boolean hasCurLevelRecord(); - /** - * .TowerCurLevelRecord cur_level_record = 10; - * @return The curLevelRecord. - */ - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord getCurLevelRecord(); - /** - * .TowerCurLevelRecord cur_level_record = 10; + * uint32 valid_floor_record_list = 5; + * @return The validFloorRecordList. */ - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder(); + int getValidFloorRecordList(); /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - * @return Whether the lastScheduleMonthlyBrief field is set. + * .TowerMonthlyBrief monthly_brief = 6; + * @return Whether the monthlyBrief field is set. */ - boolean hasLastScheduleMonthlyBrief(); + boolean hasMonthlyBrief(); /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - * @return The lastScheduleMonthlyBrief. + * .TowerMonthlyBrief monthly_brief = 6; + * @return The monthlyBrief. */ - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief(); + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief(); /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; + * .TowerMonthlyBrief monthly_brief = 6; */ - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder(); + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder(); /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ int getFloorOpenTimeMapCount(); /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ boolean containsFloorOpenTimeMap( int key); @@ -130,101 +116,114 @@ boolean containsFloorOpenTimeMap( java.util.Map getFloorOpenTimeMap(); /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ java.util.Map getFloorOpenTimeMapMap(); /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ int getFloorOpenTimeMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ int getFloorOpenTimeMapOrThrow( int key); /** - * .TowerMonthlyBrief monthly_brief = 120; - * @return Whether the monthlyBrief field is set. + * uint32 ABPDHMJNBKD = 8; + * @return The aBPDHMJNBKD. */ - boolean hasMonthlyBrief(); + int getABPDHMJNBKD(); + /** - * .TowerMonthlyBrief monthly_brief = 120; - * @return The monthlyBrief. + * uint32 tower_schedule_id = 9; + * @return The towerScheduleId. */ - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief(); + int getTowerScheduleId(); + /** - * .TowerMonthlyBrief monthly_brief = 120; + * bool is_first_interact = 10; + * @return The isFirstInteract. */ - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder(); + boolean getIsFirstInteract(); /** - * uint32 next_schedule_change_time = 11; - * @return The nextScheduleChangeTime. + * int32 retcode = 11; + * @return The retcode. */ - int getNextScheduleChangeTime(); + int getRetcode(); /** - * uint32 tower_schedule_id = 3; - * @return The towerScheduleId. + * uint32 valid_tower_record_num = 12; + * @return The validTowerRecordNum. */ - int getTowerScheduleId(); + int getValidTowerRecordNum(); /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * uint32 commemorative_reward_id = 13; + * @return The commemorativeRewardId. */ - int getSkipFloorGrantedRewardItemMapCount(); + int getCommemorativeRewardId(); + /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * bool is_finished_entrance_floor = 14; + * @return The isFinishedEntranceFloor. */ - boolean containsSkipFloorGrantedRewardItemMap( - int key); + boolean getIsFinishedEntranceFloor(); + /** - * Use {@link #getSkipFloorGrantedRewardItemMapMap()} instead. + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - @java.lang.Deprecated - java.util.Map - getSkipFloorGrantedRewardItemMap(); + java.util.List + getTowerFloorRecordListList(); /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - java.util.Map - getSkipFloorGrantedRewardItemMapMap(); + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index); /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - - int getSkipFloorGrantedRewardItemMapOrDefault( - int key, - int defaultValue); + int getTowerFloorRecordListCount(); /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - - int getSkipFloorGrantedRewardItemMapOrThrow( - int key); + java.util.List + getTowerFloorRecordListOrBuilderList(); + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( + int index); /** - * int32 retcode = 2; - * @return The retcode. + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; + * @return Whether the lastScheduleMonthlyBrief field is set. */ - int getRetcode(); + boolean hasLastScheduleMonthlyBrief(); + /** + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; + * @return The lastScheduleMonthlyBrief. + */ + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief(); + /** + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; + */ + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder(); /** - * uint32 MOOJNLEAKFC = 1; - * @return The mOOJNLEAKFC. + * uint32 schedule_start_time = 1008; + * @return The scheduleStartTime. */ - int getMOOJNLEAKFC(); + int getScheduleStartTime(); } /** * 
-   * CmdId: 3897
-   * Obf: BDPBFJJNCKK
+   * CmdId: 22979
    *
* * Protobuf type {@code TowerAllDataRsp} @@ -275,52 +274,32 @@ private TowerAllDataRsp( break; case 8: { - mOOJNLEAKFC_ = input.readUInt32(); - break; - } - case 16: { - - retcode_ = input.readInt32(); - break; - } - case 24: { - - towerScheduleId_ = input.readUInt32(); + nextScheduleChangeTime_ = input.readUInt32(); break; } - case 34: { - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder subBuilder = null; - if (lastScheduleMonthlyBrief_ != null) { - subBuilder = lastScheduleMonthlyBrief_.toBuilder(); + case 18: { + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder subBuilder = null; + if (curLevelRecord_ != null) { + subBuilder = curLevelRecord_.toBuilder(); } - lastScheduleMonthlyBrief_ = input.readMessage(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.parser(), extensionRegistry); + curLevelRecord_ = input.readMessage(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(lastScheduleMonthlyBrief_); - lastScheduleMonthlyBrief_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(curLevelRecord_); + curLevelRecord_ = subBuilder.buildPartial(); } break; } - case 40: { - - nFLJLHDCPFJ_ = input.readUInt32(); - break; - } - case 48: { - - fEOKMKFLOFI_ = input.readUInt32(); - break; - } - case 56: { + case 24: { - isFirstInteract_ = input.readBool(); + lICMPIDMCOI_ = input.readUInt32(); break; } - case 66: { - if (!((mutable_bitField0_ & 0x00000004) != 0)) { + case 34: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { skipFloorGrantedRewardItemMap_ = com.google.protobuf.MapField.newMapField( SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry); - mutable_bitField0_ |= 0x00000004; + mutable_bitField0_ |= 0x00000001; } com.google.protobuf.MapEntry skipFloorGrantedRewardItemMap__ = input.readMessage( @@ -329,35 +308,25 @@ private TowerAllDataRsp( skipFloorGrantedRewardItemMap__.getKey(), skipFloorGrantedRewardItemMap__.getValue()); break; } - case 72: { + case 40: { - jJJCPHMBMLG_ = input.readUInt32(); + validFloorRecordList_ = input.readUInt32(); break; } - case 82: { - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder subBuilder = null; - if (curLevelRecord_ != null) { - subBuilder = curLevelRecord_.toBuilder(); + case 50: { + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder subBuilder = null; + if (monthlyBrief_ != null) { + subBuilder = monthlyBrief_.toBuilder(); } - curLevelRecord_ = input.readMessage(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.parser(), extensionRegistry); + monthlyBrief_ = input.readMessage(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(curLevelRecord_); - curLevelRecord_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(monthlyBrief_); + monthlyBrief_ = subBuilder.buildPartial(); } break; } - case 88: { - - nextScheduleChangeTime_ = input.readUInt32(); - break; - } - case 96: { - - isFinishedEntranceFloor_ = input.readBool(); - break; - } - case 106: { + case 58: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { floorOpenTimeMap_ = com.google.protobuf.MapField.newMapField( FloorOpenTimeMapDefaultEntryHolder.defaultEntry); @@ -370,34 +339,64 @@ private TowerAllDataRsp( floorOpenTimeMap__.getKey(), floorOpenTimeMap__.getValue()); break; } - case 114: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { + case 64: { + + aBPDHMJNBKD_ = input.readUInt32(); + break; + } + case 72: { + + towerScheduleId_ = input.readUInt32(); + break; + } + case 80: { + + isFirstInteract_ = input.readBool(); + break; + } + case 88: { + + retcode_ = input.readInt32(); + break; + } + case 96: { + + validTowerRecordNum_ = input.readUInt32(); + break; + } + case 104: { + + commemorativeRewardId_ = input.readUInt32(); + break; + } + case 112: { + + isFinishedEntranceFloor_ = input.readBool(); + break; + } + case 122: { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { towerFloorRecordList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; + mutable_bitField0_ |= 0x00000004; } towerFloorRecordList_.add( input.readMessage(emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.parser(), extensionRegistry)); break; } - case 120: { - - cFHPLJKKOFG_ = input.readUInt32(); - break; - } - case 962: { + case 4786: { emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder subBuilder = null; - if (monthlyBrief_ != null) { - subBuilder = monthlyBrief_.toBuilder(); + if (lastScheduleMonthlyBrief_ != null) { + subBuilder = lastScheduleMonthlyBrief_.toBuilder(); } - monthlyBrief_ = input.readMessage(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.parser(), extensionRegistry); + lastScheduleMonthlyBrief_ = input.readMessage(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(monthlyBrief_); - monthlyBrief_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(lastScheduleMonthlyBrief_); + lastScheduleMonthlyBrief_ = subBuilder.buildPartial(); } break; } - case 9344: { + case 8064: { scheduleStartTime_ = input.readUInt32(); break; @@ -417,7 +416,7 @@ private TowerAllDataRsp( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) != 0)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { towerFloorRecordList_ = java.util.Collections.unmodifiableList(towerFloorRecordList_); } this.unknownFields = unknownFields.build(); @@ -434,10 +433,10 @@ private TowerAllDataRsp( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 13: - return internalGetFloorOpenTimeMap(); - case 8: + case 4: return internalGetSkipFloorGrantedRewardItemMap(); + case 7: + return internalGetFloorOpenTimeMap(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -451,176 +450,173 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp.class, emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp.Builder.class); } - public static final int IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER = 12; - private boolean isFinishedEntranceFloor_; + public static final int NEXT_SCHEDULE_CHANGE_TIME_FIELD_NUMBER = 1; + private int nextScheduleChangeTime_; /** - * bool is_finished_entrance_floor = 12; - * @return The isFinishedEntranceFloor. + * uint32 next_schedule_change_time = 1; + * @return The nextScheduleChangeTime. */ @java.lang.Override - public boolean getIsFinishedEntranceFloor() { - return isFinishedEntranceFloor_; + public int getNextScheduleChangeTime() { + return nextScheduleChangeTime_; } - public static final int SCHEDULE_START_TIME_FIELD_NUMBER = 1168; - private int scheduleStartTime_; + public static final int CUR_LEVEL_RECORD_FIELD_NUMBER = 2; + private emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord curLevelRecord_; /** - * uint32 schedule_start_time = 1168; - * @return The scheduleStartTime. + * .TowerCurLevelRecord cur_level_record = 2; + * @return Whether the curLevelRecord field is set. */ @java.lang.Override - public int getScheduleStartTime() { - return scheduleStartTime_; + public boolean hasCurLevelRecord() { + return curLevelRecord_ != null; } - - public static final int FEOKMKFLOFI_FIELD_NUMBER = 6; - private int fEOKMKFLOFI_; /** - * uint32 FEOKMKFLOFI = 6; - * @return The fEOKMKFLOFI. + * .TowerCurLevelRecord cur_level_record = 2; + * @return The curLevelRecord. */ @java.lang.Override - public int getFEOKMKFLOFI() { - return fEOKMKFLOFI_; + public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord getCurLevelRecord() { + return curLevelRecord_ == null ? emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.getDefaultInstance() : curLevelRecord_; } - - public static final int CFHPLJKKOFG_FIELD_NUMBER = 15; - private int cFHPLJKKOFG_; /** - * uint32 CFHPLJKKOFG = 15; - * @return The cFHPLJKKOFG. + * .TowerCurLevelRecord cur_level_record = 2; */ @java.lang.Override - public int getCFHPLJKKOFG() { - return cFHPLJKKOFG_; + public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder() { + return getCurLevelRecord(); } - public static final int NFLJLHDCPFJ_FIELD_NUMBER = 5; - private int nFLJLHDCPFJ_; + public static final int LICMPIDMCOI_FIELD_NUMBER = 3; + private int lICMPIDMCOI_; /** - * uint32 NFLJLHDCPFJ = 5; - * @return The nFLJLHDCPFJ. + * uint32 LICMPIDMCOI = 3; + * @return The lICMPIDMCOI. */ @java.lang.Override - public int getNFLJLHDCPFJ() { - return nFLJLHDCPFJ_; + public int getLICMPIDMCOI() { + return lICMPIDMCOI_; } - public static final int TOWER_FLOOR_RECORD_LIST_FIELD_NUMBER = 14; - private java.util.List towerFloorRecordList_; - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - @java.lang.Override - public java.util.List getTowerFloorRecordListList() { - return towerFloorRecordList_; - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - @java.lang.Override - public java.util.List - getTowerFloorRecordListOrBuilderList() { - return towerFloorRecordList_; + public static final int SKIP_FLOOR_GRANTED_REWARD_ITEM_MAP_FIELD_NUMBER = 4; + private static final class SkipFloorGrantedRewardItemMapDefaultEntryHolder { + static final com.google.protobuf.MapEntry< + java.lang.Integer, java.lang.Integer> defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + emu.grasscutter.net.proto.TowerAllDataRspOuterClass.internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.UINT32, + 0, + com.google.protobuf.WireFormat.FieldType.UINT32, + 0); } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - @java.lang.Override - public int getTowerFloorRecordListCount() { - return towerFloorRecordList_.size(); + private com.google.protobuf.MapField< + java.lang.Integer, java.lang.Integer> skipFloorGrantedRewardItemMap_; + private com.google.protobuf.MapField + internalGetSkipFloorGrantedRewardItemMap() { + if (skipFloorGrantedRewardItemMap_ == null) { + return com.google.protobuf.MapField.emptyMapField( + SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry); + } + return skipFloorGrantedRewardItemMap_; } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - @java.lang.Override - public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index) { - return towerFloorRecordList_.get(index); + + public int getSkipFloorGrantedRewardItemMapCount() { + return internalGetSkipFloorGrantedRewardItemMap().getMap().size(); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ + @java.lang.Override - public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( - int index) { - return towerFloorRecordList_.get(index); + public boolean containsSkipFloorGrantedRewardItemMap( + int key) { + + return internalGetSkipFloorGrantedRewardItemMap().getMap().containsKey(key); } - - public static final int JJJCPHMBMLG_FIELD_NUMBER = 9; - private int jJJCPHMBMLG_; /** - * uint32 JJJCPHMBMLG = 9; - * @return The jJJCPHMBMLG. + * Use {@link #getSkipFloorGrantedRewardItemMapMap()} instead. */ @java.lang.Override - public int getJJJCPHMBMLG() { - return jJJCPHMBMLG_; + @java.lang.Deprecated + public java.util.Map getSkipFloorGrantedRewardItemMap() { + return getSkipFloorGrantedRewardItemMapMap(); } - - public static final int IS_FIRST_INTERACT_FIELD_NUMBER = 7; - private boolean isFirstInteract_; /** - * bool is_first_interact = 7; - * @return The isFirstInteract. + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ @java.lang.Override - public boolean getIsFirstInteract() { - return isFirstInteract_; - } - public static final int CUR_LEVEL_RECORD_FIELD_NUMBER = 10; - private emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord curLevelRecord_; + public java.util.Map getSkipFloorGrantedRewardItemMapMap() { + return internalGetSkipFloorGrantedRewardItemMap().getMap(); + } /** - * .TowerCurLevelRecord cur_level_record = 10; - * @return Whether the curLevelRecord field is set. + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ @java.lang.Override - public boolean hasCurLevelRecord() { - return curLevelRecord_ != null; + + public int getSkipFloorGrantedRewardItemMapOrDefault( + int key, + int defaultValue) { + + java.util.Map map = + internalGetSkipFloorGrantedRewardItemMap().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * .TowerCurLevelRecord cur_level_record = 10; - * @return The curLevelRecord. + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord getCurLevelRecord() { - return curLevelRecord_ == null ? emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.getDefaultInstance() : curLevelRecord_; + + public int getSkipFloorGrantedRewardItemMapOrThrow( + int key) { + + java.util.Map map = + internalGetSkipFloorGrantedRewardItemMap().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); } + + public static final int VALID_FLOOR_RECORD_LIST_FIELD_NUMBER = 5; + private int validFloorRecordList_; /** - * .TowerCurLevelRecord cur_level_record = 10; + * uint32 valid_floor_record_list = 5; + * @return The validFloorRecordList. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder() { - return getCurLevelRecord(); + public int getValidFloorRecordList() { + return validFloorRecordList_; } - public static final int LAST_SCHEDULE_MONTHLY_BRIEF_FIELD_NUMBER = 4; - private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief lastScheduleMonthlyBrief_; + public static final int MONTHLY_BRIEF_FIELD_NUMBER = 6; + private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief monthlyBrief_; /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - * @return Whether the lastScheduleMonthlyBrief field is set. + * .TowerMonthlyBrief monthly_brief = 6; + * @return Whether the monthlyBrief field is set. */ @java.lang.Override - public boolean hasLastScheduleMonthlyBrief() { - return lastScheduleMonthlyBrief_ != null; + public boolean hasMonthlyBrief() { + return monthlyBrief_ != null; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - * @return The lastScheduleMonthlyBrief. + * .TowerMonthlyBrief monthly_brief = 6; + * @return The monthlyBrief. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief() { - return lastScheduleMonthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief() { + return monthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; + * .TowerMonthlyBrief monthly_brief = 6; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder() { - return getLastScheduleMonthlyBrief(); + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder() { + return getMonthlyBrief(); } - public static final int FLOOR_OPEN_TIME_MAP_FIELD_NUMBER = 13; + public static final int FLOOR_OPEN_TIME_MAP_FIELD_NUMBER = 7; private static final class FloorOpenTimeMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -647,7 +643,7 @@ public int getFloorOpenTimeMapCount() { return internalGetFloorOpenTimeMap().getMap().size(); } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ @java.lang.Override @@ -665,7 +661,7 @@ public java.util.Map getFloorOpenTimeMap() return getFloorOpenTimeMapMap(); } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ @java.lang.Override @@ -673,7 +669,7 @@ public java.util.Map getFloorOpenTimeMapMa return internalGetFloorOpenTimeMap().getMap(); } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ @java.lang.Override @@ -686,7 +682,7 @@ public int getFloorOpenTimeMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ @java.lang.Override @@ -701,155 +697,158 @@ public int getFloorOpenTimeMapOrThrow( return map.get(key); } - public static final int MONTHLY_BRIEF_FIELD_NUMBER = 120; - private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief monthlyBrief_; + public static final int ABPDHMJNBKD_FIELD_NUMBER = 8; + private int aBPDHMJNBKD_; /** - * .TowerMonthlyBrief monthly_brief = 120; - * @return Whether the monthlyBrief field is set. + * uint32 ABPDHMJNBKD = 8; + * @return The aBPDHMJNBKD. */ @java.lang.Override - public boolean hasMonthlyBrief() { - return monthlyBrief_ != null; + public int getABPDHMJNBKD() { + return aBPDHMJNBKD_; } + + public static final int TOWER_SCHEDULE_ID_FIELD_NUMBER = 9; + private int towerScheduleId_; /** - * .TowerMonthlyBrief monthly_brief = 120; - * @return The monthlyBrief. + * uint32 tower_schedule_id = 9; + * @return The towerScheduleId. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief() { - return monthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; + public int getTowerScheduleId() { + return towerScheduleId_; } + + public static final int IS_FIRST_INTERACT_FIELD_NUMBER = 10; + private boolean isFirstInteract_; /** - * .TowerMonthlyBrief monthly_brief = 120; + * bool is_first_interact = 10; + * @return The isFirstInteract. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder() { - return getMonthlyBrief(); + public boolean getIsFirstInteract() { + return isFirstInteract_; } - public static final int NEXT_SCHEDULE_CHANGE_TIME_FIELD_NUMBER = 11; - private int nextScheduleChangeTime_; + public static final int RETCODE_FIELD_NUMBER = 11; + private int retcode_; /** - * uint32 next_schedule_change_time = 11; - * @return The nextScheduleChangeTime. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getNextScheduleChangeTime() { - return nextScheduleChangeTime_; + public int getRetcode() { + return retcode_; } - public static final int TOWER_SCHEDULE_ID_FIELD_NUMBER = 3; - private int towerScheduleId_; + public static final int VALID_TOWER_RECORD_NUM_FIELD_NUMBER = 12; + private int validTowerRecordNum_; /** - * uint32 tower_schedule_id = 3; - * @return The towerScheduleId. + * uint32 valid_tower_record_num = 12; + * @return The validTowerRecordNum. */ @java.lang.Override - public int getTowerScheduleId() { - return towerScheduleId_; + public int getValidTowerRecordNum() { + return validTowerRecordNum_; } - public static final int SKIP_FLOOR_GRANTED_REWARD_ITEM_MAP_FIELD_NUMBER = 8; - private static final class SkipFloorGrantedRewardItemMapDefaultEntryHolder { - static final com.google.protobuf.MapEntry< - java.lang.Integer, java.lang.Integer> defaultEntry = - com.google.protobuf.MapEntry - .newDefaultInstance( - emu.grasscutter.net.proto.TowerAllDataRspOuterClass.internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_descriptor, - com.google.protobuf.WireFormat.FieldType.UINT32, - 0, - com.google.protobuf.WireFormat.FieldType.UINT32, - 0); + public static final int COMMEMORATIVE_REWARD_ID_FIELD_NUMBER = 13; + private int commemorativeRewardId_; + /** + * uint32 commemorative_reward_id = 13; + * @return The commemorativeRewardId. + */ + @java.lang.Override + public int getCommemorativeRewardId() { + return commemorativeRewardId_; } - private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> skipFloorGrantedRewardItemMap_; - private com.google.protobuf.MapField - internalGetSkipFloorGrantedRewardItemMap() { - if (skipFloorGrantedRewardItemMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry); - } - return skipFloorGrantedRewardItemMap_; + + public static final int IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER = 14; + private boolean isFinishedEntranceFloor_; + /** + * bool is_finished_entrance_floor = 14; + * @return The isFinishedEntranceFloor. + */ + @java.lang.Override + public boolean getIsFinishedEntranceFloor() { + return isFinishedEntranceFloor_; } - public int getSkipFloorGrantedRewardItemMapCount() { - return internalGetSkipFloorGrantedRewardItemMap().getMap().size(); + public static final int TOWER_FLOOR_RECORD_LIST_FIELD_NUMBER = 15; + private java.util.List towerFloorRecordList_; + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + @java.lang.Override + public java.util.List getTowerFloorRecordListList() { + return towerFloorRecordList_; } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - @java.lang.Override - public boolean containsSkipFloorGrantedRewardItemMap( - int key) { - - return internalGetSkipFloorGrantedRewardItemMap().getMap().containsKey(key); + public java.util.List + getTowerFloorRecordListOrBuilderList() { + return towerFloorRecordList_; } /** - * Use {@link #getSkipFloorGrantedRewardItemMapMap()} instead. + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ @java.lang.Override - @java.lang.Deprecated - public java.util.Map getSkipFloorGrantedRewardItemMap() { - return getSkipFloorGrantedRewardItemMapMap(); + public int getTowerFloorRecordListCount() { + return towerFloorRecordList_.size(); } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ @java.lang.Override - - public java.util.Map getSkipFloorGrantedRewardItemMapMap() { - return internalGetSkipFloorGrantedRewardItemMap().getMap(); + public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index) { + return towerFloorRecordList_.get(index); } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ @java.lang.Override + public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( + int index) { + return towerFloorRecordList_.get(index); + } - public int getSkipFloorGrantedRewardItemMapOrDefault( - int key, - int defaultValue) { - - java.util.Map map = - internalGetSkipFloorGrantedRewardItemMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; + public static final int LAST_SCHEDULE_MONTHLY_BRIEF_FIELD_NUMBER = 598; + private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief lastScheduleMonthlyBrief_; + /** + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; + * @return Whether the lastScheduleMonthlyBrief field is set. + */ + @java.lang.Override + public boolean hasLastScheduleMonthlyBrief() { + return lastScheduleMonthlyBrief_ != null; } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; + * @return The lastScheduleMonthlyBrief. */ @java.lang.Override - - public int getSkipFloorGrantedRewardItemMapOrThrow( - int key) { - - java.util.Map map = - internalGetSkipFloorGrantedRewardItemMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief() { + return lastScheduleMonthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; } - - public static final int RETCODE_FIELD_NUMBER = 2; - private int retcode_; /** - * int32 retcode = 2; - * @return The retcode. + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; */ @java.lang.Override - public int getRetcode() { - return retcode_; + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder() { + return getLastScheduleMonthlyBrief(); } - public static final int MOOJNLEAKFC_FIELD_NUMBER = 1; - private int mOOJNLEAKFC_; + public static final int SCHEDULE_START_TIME_FIELD_NUMBER = 1008; + private int scheduleStartTime_; /** - * uint32 MOOJNLEAKFC = 1; - * @return The mOOJNLEAKFC. + * uint32 schedule_start_time = 1008; + * @return The scheduleStartTime. */ @java.lang.Override - public int getMOOJNLEAKFC() { - return mOOJNLEAKFC_; + public int getScheduleStartTime() { + return scheduleStartTime_; } private byte memoizedIsInitialized = -1; @@ -866,62 +865,62 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (mOOJNLEAKFC_ != 0) { - output.writeUInt32(1, mOOJNLEAKFC_); - } - if (retcode_ != 0) { - output.writeInt32(2, retcode_); - } - if (towerScheduleId_ != 0) { - output.writeUInt32(3, towerScheduleId_); - } - if (lastScheduleMonthlyBrief_ != null) { - output.writeMessage(4, getLastScheduleMonthlyBrief()); - } - if (nFLJLHDCPFJ_ != 0) { - output.writeUInt32(5, nFLJLHDCPFJ_); + if (nextScheduleChangeTime_ != 0) { + output.writeUInt32(1, nextScheduleChangeTime_); } - if (fEOKMKFLOFI_ != 0) { - output.writeUInt32(6, fEOKMKFLOFI_); + if (curLevelRecord_ != null) { + output.writeMessage(2, getCurLevelRecord()); } - if (isFirstInteract_ != false) { - output.writeBool(7, isFirstInteract_); + if (lICMPIDMCOI_ != 0) { + output.writeUInt32(3, lICMPIDMCOI_); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetSkipFloorGrantedRewardItemMap(), SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry, - 8); - if (jJJCPHMBMLG_ != 0) { - output.writeUInt32(9, jJJCPHMBMLG_); - } - if (curLevelRecord_ != null) { - output.writeMessage(10, getCurLevelRecord()); + 4); + if (validFloorRecordList_ != 0) { + output.writeUInt32(5, validFloorRecordList_); } - if (nextScheduleChangeTime_ != 0) { - output.writeUInt32(11, nextScheduleChangeTime_); - } - if (isFinishedEntranceFloor_ != false) { - output.writeBool(12, isFinishedEntranceFloor_); + if (monthlyBrief_ != null) { + output.writeMessage(6, getMonthlyBrief()); } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetFloorOpenTimeMap(), FloorOpenTimeMapDefaultEntryHolder.defaultEntry, - 13); - for (int i = 0; i < towerFloorRecordList_.size(); i++) { - output.writeMessage(14, towerFloorRecordList_.get(i)); + 7); + if (aBPDHMJNBKD_ != 0) { + output.writeUInt32(8, aBPDHMJNBKD_); } - if (cFHPLJKKOFG_ != 0) { - output.writeUInt32(15, cFHPLJKKOFG_); + if (towerScheduleId_ != 0) { + output.writeUInt32(9, towerScheduleId_); } - if (monthlyBrief_ != null) { - output.writeMessage(120, getMonthlyBrief()); + if (isFirstInteract_ != false) { + output.writeBool(10, isFirstInteract_); + } + if (retcode_ != 0) { + output.writeInt32(11, retcode_); + } + if (validTowerRecordNum_ != 0) { + output.writeUInt32(12, validTowerRecordNum_); + } + if (commemorativeRewardId_ != 0) { + output.writeUInt32(13, commemorativeRewardId_); + } + if (isFinishedEntranceFloor_ != false) { + output.writeBool(14, isFinishedEntranceFloor_); + } + for (int i = 0; i < towerFloorRecordList_.size(); i++) { + output.writeMessage(15, towerFloorRecordList_.get(i)); + } + if (lastScheduleMonthlyBrief_ != null) { + output.writeMessage(598, getLastScheduleMonthlyBrief()); } if (scheduleStartTime_ != 0) { - output.writeUInt32(1168, scheduleStartTime_); + output.writeUInt32(1008, scheduleStartTime_); } unknownFields.writeTo(output); } @@ -932,85 +931,85 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (mOOJNLEAKFC_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, mOOJNLEAKFC_); - } - if (retcode_ != 0) { + if (nextScheduleChangeTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, retcode_); + .computeUInt32Size(1, nextScheduleChangeTime_); } - if (towerScheduleId_ != 0) { + if (curLevelRecord_ != null) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, towerScheduleId_); + .computeMessageSize(2, getCurLevelRecord()); } - if (lastScheduleMonthlyBrief_ != null) { + if (lICMPIDMCOI_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getLastScheduleMonthlyBrief()); + .computeUInt32Size(3, lICMPIDMCOI_); } - if (nFLJLHDCPFJ_ != 0) { + for (java.util.Map.Entry entry + : internalGetSkipFloorGrantedRewardItemMap().getMap().entrySet()) { + com.google.protobuf.MapEntry + skipFloorGrantedRewardItemMap__ = SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, nFLJLHDCPFJ_); + .computeMessageSize(4, skipFloorGrantedRewardItemMap__); } - if (fEOKMKFLOFI_ != 0) { + if (validFloorRecordList_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, fEOKMKFLOFI_); + .computeUInt32Size(5, validFloorRecordList_); } - if (isFirstInteract_ != false) { + if (monthlyBrief_ != null) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, isFirstInteract_); + .computeMessageSize(6, getMonthlyBrief()); } for (java.util.Map.Entry entry - : internalGetSkipFloorGrantedRewardItemMap().getMap().entrySet()) { + : internalGetFloorOpenTimeMap().getMap().entrySet()) { com.google.protobuf.MapEntry - skipFloorGrantedRewardItemMap__ = SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry.newBuilderForType() + floorOpenTimeMap__ = FloorOpenTimeMapDefaultEntryHolder.defaultEntry.newBuilderForType() .setKey(entry.getKey()) .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, skipFloorGrantedRewardItemMap__); + .computeMessageSize(7, floorOpenTimeMap__); } - if (jJJCPHMBMLG_ != 0) { + if (aBPDHMJNBKD_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, jJJCPHMBMLG_); + .computeUInt32Size(8, aBPDHMJNBKD_); } - if (curLevelRecord_ != null) { + if (towerScheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, getCurLevelRecord()); + .computeUInt32Size(9, towerScheduleId_); } - if (nextScheduleChangeTime_ != 0) { + if (isFirstInteract_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, nextScheduleChangeTime_); + .computeBoolSize(10, isFirstInteract_); } - if (isFinishedEntranceFloor_ != false) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(12, isFinishedEntranceFloor_); + .computeInt32Size(11, retcode_); } - for (java.util.Map.Entry entry - : internalGetFloorOpenTimeMap().getMap().entrySet()) { - com.google.protobuf.MapEntry - floorOpenTimeMap__ = FloorOpenTimeMapDefaultEntryHolder.defaultEntry.newBuilderForType() - .setKey(entry.getKey()) - .setValue(entry.getValue()) - .build(); + if (validTowerRecordNum_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, floorOpenTimeMap__); + .computeUInt32Size(12, validTowerRecordNum_); } - for (int i = 0; i < towerFloorRecordList_.size(); i++) { + if (commemorativeRewardId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, towerFloorRecordList_.get(i)); + .computeUInt32Size(13, commemorativeRewardId_); } - if (cFHPLJKKOFG_ != 0) { + if (isFinishedEntranceFloor_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, cFHPLJKKOFG_); + .computeBoolSize(14, isFinishedEntranceFloor_); } - if (monthlyBrief_ != null) { + for (int i = 0; i < towerFloorRecordList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(15, towerFloorRecordList_.get(i)); + } + if (lastScheduleMonthlyBrief_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(120, getMonthlyBrief()); + .computeMessageSize(598, getLastScheduleMonthlyBrief()); } if (scheduleStartTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1168, scheduleStartTime_); + .computeUInt32Size(1008, scheduleStartTime_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -1027,49 +1026,49 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp other = (emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp) obj; - if (getIsFinishedEntranceFloor() - != other.getIsFinishedEntranceFloor()) return false; - if (getScheduleStartTime() - != other.getScheduleStartTime()) return false; - if (getFEOKMKFLOFI() - != other.getFEOKMKFLOFI()) return false; - if (getCFHPLJKKOFG() - != other.getCFHPLJKKOFG()) return false; - if (getNFLJLHDCPFJ() - != other.getNFLJLHDCPFJ()) return false; - if (!getTowerFloorRecordListList() - .equals(other.getTowerFloorRecordListList())) return false; - if (getJJJCPHMBMLG() - != other.getJJJCPHMBMLG()) return false; - if (getIsFirstInteract() - != other.getIsFirstInteract()) return false; + if (getNextScheduleChangeTime() + != other.getNextScheduleChangeTime()) return false; if (hasCurLevelRecord() != other.hasCurLevelRecord()) return false; if (hasCurLevelRecord()) { if (!getCurLevelRecord() .equals(other.getCurLevelRecord())) return false; } - if (hasLastScheduleMonthlyBrief() != other.hasLastScheduleMonthlyBrief()) return false; - if (hasLastScheduleMonthlyBrief()) { - if (!getLastScheduleMonthlyBrief() - .equals(other.getLastScheduleMonthlyBrief())) return false; - } - if (!internalGetFloorOpenTimeMap().equals( - other.internalGetFloorOpenTimeMap())) return false; + if (getLICMPIDMCOI() + != other.getLICMPIDMCOI()) return false; + if (!internalGetSkipFloorGrantedRewardItemMap().equals( + other.internalGetSkipFloorGrantedRewardItemMap())) return false; + if (getValidFloorRecordList() + != other.getValidFloorRecordList()) return false; if (hasMonthlyBrief() != other.hasMonthlyBrief()) return false; if (hasMonthlyBrief()) { if (!getMonthlyBrief() .equals(other.getMonthlyBrief())) return false; } - if (getNextScheduleChangeTime() - != other.getNextScheduleChangeTime()) return false; + if (!internalGetFloorOpenTimeMap().equals( + other.internalGetFloorOpenTimeMap())) return false; + if (getABPDHMJNBKD() + != other.getABPDHMJNBKD()) return false; if (getTowerScheduleId() != other.getTowerScheduleId()) return false; - if (!internalGetSkipFloorGrantedRewardItemMap().equals( - other.internalGetSkipFloorGrantedRewardItemMap())) return false; + if (getIsFirstInteract() + != other.getIsFirstInteract()) return false; if (getRetcode() != other.getRetcode()) return false; - if (getMOOJNLEAKFC() - != other.getMOOJNLEAKFC()) return false; + if (getValidTowerRecordNum() + != other.getValidTowerRecordNum()) return false; + if (getCommemorativeRewardId() + != other.getCommemorativeRewardId()) return false; + if (getIsFinishedEntranceFloor() + != other.getIsFinishedEntranceFloor()) return false; + if (!getTowerFloorRecordListList() + .equals(other.getTowerFloorRecordListList())) return false; + if (hasLastScheduleMonthlyBrief() != other.hasLastScheduleMonthlyBrief()) return false; + if (hasLastScheduleMonthlyBrief()) { + if (!getLastScheduleMonthlyBrief() + .equals(other.getLastScheduleMonthlyBrief())) return false; + } + if (getScheduleStartTime() + != other.getScheduleStartTime()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -1081,54 +1080,54 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsFinishedEntranceFloor()); - hash = (37 * hash) + SCHEDULE_START_TIME_FIELD_NUMBER; - hash = (53 * hash) + getScheduleStartTime(); - hash = (37 * hash) + FEOKMKFLOFI_FIELD_NUMBER; - hash = (53 * hash) + getFEOKMKFLOFI(); - hash = (37 * hash) + CFHPLJKKOFG_FIELD_NUMBER; - hash = (53 * hash) + getCFHPLJKKOFG(); - hash = (37 * hash) + NFLJLHDCPFJ_FIELD_NUMBER; - hash = (53 * hash) + getNFLJLHDCPFJ(); - if (getTowerFloorRecordListCount() > 0) { - hash = (37 * hash) + TOWER_FLOOR_RECORD_LIST_FIELD_NUMBER; - hash = (53 * hash) + getTowerFloorRecordListList().hashCode(); - } - hash = (37 * hash) + JJJCPHMBMLG_FIELD_NUMBER; - hash = (53 * hash) + getJJJCPHMBMLG(); - hash = (37 * hash) + IS_FIRST_INTERACT_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsFirstInteract()); + hash = (37 * hash) + NEXT_SCHEDULE_CHANGE_TIME_FIELD_NUMBER; + hash = (53 * hash) + getNextScheduleChangeTime(); if (hasCurLevelRecord()) { hash = (37 * hash) + CUR_LEVEL_RECORD_FIELD_NUMBER; hash = (53 * hash) + getCurLevelRecord().hashCode(); } - if (hasLastScheduleMonthlyBrief()) { - hash = (37 * hash) + LAST_SCHEDULE_MONTHLY_BRIEF_FIELD_NUMBER; - hash = (53 * hash) + getLastScheduleMonthlyBrief().hashCode(); - } - if (!internalGetFloorOpenTimeMap().getMap().isEmpty()) { - hash = (37 * hash) + FLOOR_OPEN_TIME_MAP_FIELD_NUMBER; - hash = (53 * hash) + internalGetFloorOpenTimeMap().hashCode(); + hash = (37 * hash) + LICMPIDMCOI_FIELD_NUMBER; + hash = (53 * hash) + getLICMPIDMCOI(); + if (!internalGetSkipFloorGrantedRewardItemMap().getMap().isEmpty()) { + hash = (37 * hash) + SKIP_FLOOR_GRANTED_REWARD_ITEM_MAP_FIELD_NUMBER; + hash = (53 * hash) + internalGetSkipFloorGrantedRewardItemMap().hashCode(); } + hash = (37 * hash) + VALID_FLOOR_RECORD_LIST_FIELD_NUMBER; + hash = (53 * hash) + getValidFloorRecordList(); if (hasMonthlyBrief()) { hash = (37 * hash) + MONTHLY_BRIEF_FIELD_NUMBER; hash = (53 * hash) + getMonthlyBrief().hashCode(); } - hash = (37 * hash) + NEXT_SCHEDULE_CHANGE_TIME_FIELD_NUMBER; - hash = (53 * hash) + getNextScheduleChangeTime(); + if (!internalGetFloorOpenTimeMap().getMap().isEmpty()) { + hash = (37 * hash) + FLOOR_OPEN_TIME_MAP_FIELD_NUMBER; + hash = (53 * hash) + internalGetFloorOpenTimeMap().hashCode(); + } + hash = (37 * hash) + ABPDHMJNBKD_FIELD_NUMBER; + hash = (53 * hash) + getABPDHMJNBKD(); hash = (37 * hash) + TOWER_SCHEDULE_ID_FIELD_NUMBER; hash = (53 * hash) + getTowerScheduleId(); - if (!internalGetSkipFloorGrantedRewardItemMap().getMap().isEmpty()) { - hash = (37 * hash) + SKIP_FLOOR_GRANTED_REWARD_ITEM_MAP_FIELD_NUMBER; - hash = (53 * hash) + internalGetSkipFloorGrantedRewardItemMap().hashCode(); - } + hash = (37 * hash) + IS_FIRST_INTERACT_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsFirstInteract()); hash = (37 * hash) + RETCODE_FIELD_NUMBER; hash = (53 * hash) + getRetcode(); - hash = (37 * hash) + MOOJNLEAKFC_FIELD_NUMBER; - hash = (53 * hash) + getMOOJNLEAKFC(); + hash = (37 * hash) + VALID_TOWER_RECORD_NUM_FIELD_NUMBER; + hash = (53 * hash) + getValidTowerRecordNum(); + hash = (37 * hash) + COMMEMORATIVE_REWARD_ID_FIELD_NUMBER; + hash = (53 * hash) + getCommemorativeRewardId(); + hash = (37 * hash) + IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsFinishedEntranceFloor()); + if (getTowerFloorRecordListCount() > 0) { + hash = (37 * hash) + TOWER_FLOOR_RECORD_LIST_FIELD_NUMBER; + hash = (53 * hash) + getTowerFloorRecordListList().hashCode(); + } + if (hasLastScheduleMonthlyBrief()) { + hash = (37 * hash) + LAST_SCHEDULE_MONTHLY_BRIEF_FIELD_NUMBER; + hash = (53 * hash) + getLastScheduleMonthlyBrief().hashCode(); + } + hash = (37 * hash) + SCHEDULE_START_TIME_FIELD_NUMBER; + hash = (53 * hash) + getScheduleStartTime(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1226,8 +1225,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 3897
-     * Obf: BDPBFJJNCKK
+     * CmdId: 22979
      *
* * Protobuf type {@code TowerAllDataRsp} @@ -1245,10 +1243,10 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 13: - return internalGetFloorOpenTimeMap(); - case 8: + case 4: return internalGetSkipFloorGrantedRewardItemMap(); + case 7: + return internalGetFloorOpenTimeMap(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -1258,10 +1256,10 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 13: - return internalGetMutableFloorOpenTimeMap(); - case 8: + case 4: return internalGetMutableSkipFloorGrantedRewardItemMap(); + case 7: + return internalGetMutableFloorOpenTimeMap(); default: throw new RuntimeException( "Invalid map field number: " + number); @@ -1294,25 +1292,7 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - isFinishedEntranceFloor_ = false; - - scheduleStartTime_ = 0; - - fEOKMKFLOFI_ = 0; - - cFHPLJKKOFG_ = 0; - - nFLJLHDCPFJ_ = 0; - - if (towerFloorRecordListBuilder_ == null) { - towerFloorRecordList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - towerFloorRecordListBuilder_.clear(); - } - jJJCPHMBMLG_ = 0; - - isFirstInteract_ = false; + nextScheduleChangeTime_ = 0; if (curLevelRecordBuilder_ == null) { curLevelRecord_ = null; @@ -1320,27 +1300,45 @@ public Builder clear() { curLevelRecord_ = null; curLevelRecordBuilder_ = null; } - if (lastScheduleMonthlyBriefBuilder_ == null) { - lastScheduleMonthlyBrief_ = null; - } else { - lastScheduleMonthlyBrief_ = null; - lastScheduleMonthlyBriefBuilder_ = null; - } - internalGetMutableFloorOpenTimeMap().clear(); + lICMPIDMCOI_ = 0; + + internalGetMutableSkipFloorGrantedRewardItemMap().clear(); + validFloorRecordList_ = 0; + if (monthlyBriefBuilder_ == null) { monthlyBrief_ = null; } else { monthlyBrief_ = null; monthlyBriefBuilder_ = null; } - nextScheduleChangeTime_ = 0; + internalGetMutableFloorOpenTimeMap().clear(); + aBPDHMJNBKD_ = 0; towerScheduleId_ = 0; - internalGetMutableSkipFloorGrantedRewardItemMap().clear(); + isFirstInteract_ = false; + retcode_ = 0; - mOOJNLEAKFC_ = 0; + validTowerRecordNum_ = 0; + + commemorativeRewardId_ = 0; + + isFinishedEntranceFloor_ = false; + + if (towerFloorRecordListBuilder_ == null) { + towerFloorRecordList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + } else { + towerFloorRecordListBuilder_.clear(); + } + if (lastScheduleMonthlyBriefBuilder_ == null) { + lastScheduleMonthlyBrief_ = null; + } else { + lastScheduleMonthlyBrief_ = null; + lastScheduleMonthlyBriefBuilder_ = null; + } + scheduleStartTime_ = 0; return this; } @@ -1369,45 +1367,45 @@ public emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp build public emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp buildPartial() { emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp result = new emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp(this); int from_bitField0_ = bitField0_; + result.nextScheduleChangeTime_ = nextScheduleChangeTime_; + if (curLevelRecordBuilder_ == null) { + result.curLevelRecord_ = curLevelRecord_; + } else { + result.curLevelRecord_ = curLevelRecordBuilder_.build(); + } + result.lICMPIDMCOI_ = lICMPIDMCOI_; + result.skipFloorGrantedRewardItemMap_ = internalGetSkipFloorGrantedRewardItemMap(); + result.skipFloorGrantedRewardItemMap_.makeImmutable(); + result.validFloorRecordList_ = validFloorRecordList_; + if (monthlyBriefBuilder_ == null) { + result.monthlyBrief_ = monthlyBrief_; + } else { + result.monthlyBrief_ = monthlyBriefBuilder_.build(); + } + result.floorOpenTimeMap_ = internalGetFloorOpenTimeMap(); + result.floorOpenTimeMap_.makeImmutable(); + result.aBPDHMJNBKD_ = aBPDHMJNBKD_; + result.towerScheduleId_ = towerScheduleId_; + result.isFirstInteract_ = isFirstInteract_; + result.retcode_ = retcode_; + result.validTowerRecordNum_ = validTowerRecordNum_; + result.commemorativeRewardId_ = commemorativeRewardId_; result.isFinishedEntranceFloor_ = isFinishedEntranceFloor_; - result.scheduleStartTime_ = scheduleStartTime_; - result.fEOKMKFLOFI_ = fEOKMKFLOFI_; - result.cFHPLJKKOFG_ = cFHPLJKKOFG_; - result.nFLJLHDCPFJ_ = nFLJLHDCPFJ_; if (towerFloorRecordListBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000004) != 0)) { towerFloorRecordList_ = java.util.Collections.unmodifiableList(towerFloorRecordList_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); } result.towerFloorRecordList_ = towerFloorRecordList_; } else { result.towerFloorRecordList_ = towerFloorRecordListBuilder_.build(); } - result.jJJCPHMBMLG_ = jJJCPHMBMLG_; - result.isFirstInteract_ = isFirstInteract_; - if (curLevelRecordBuilder_ == null) { - result.curLevelRecord_ = curLevelRecord_; - } else { - result.curLevelRecord_ = curLevelRecordBuilder_.build(); - } if (lastScheduleMonthlyBriefBuilder_ == null) { result.lastScheduleMonthlyBrief_ = lastScheduleMonthlyBrief_; } else { result.lastScheduleMonthlyBrief_ = lastScheduleMonthlyBriefBuilder_.build(); } - result.floorOpenTimeMap_ = internalGetFloorOpenTimeMap(); - result.floorOpenTimeMap_.makeImmutable(); - if (monthlyBriefBuilder_ == null) { - result.monthlyBrief_ = monthlyBrief_; - } else { - result.monthlyBrief_ = monthlyBriefBuilder_.build(); - } - result.nextScheduleChangeTime_ = nextScheduleChangeTime_; - result.towerScheduleId_ = towerScheduleId_; - result.skipFloorGrantedRewardItemMap_ = internalGetSkipFloorGrantedRewardItemMap(); - result.skipFloorGrantedRewardItemMap_.makeImmutable(); - result.retcode_ = retcode_; - result.mOOJNLEAKFC_ = mOOJNLEAKFC_; + result.scheduleStartTime_ = scheduleStartTime_; onBuilt(); return result; } @@ -1456,26 +1454,51 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp other) { if (other == emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp.getDefaultInstance()) return this; - if (other.getIsFinishedEntranceFloor() != false) { - setIsFinishedEntranceFloor(other.getIsFinishedEntranceFloor()); + if (other.getNextScheduleChangeTime() != 0) { + setNextScheduleChangeTime(other.getNextScheduleChangeTime()); } - if (other.getScheduleStartTime() != 0) { - setScheduleStartTime(other.getScheduleStartTime()); + if (other.hasCurLevelRecord()) { + mergeCurLevelRecord(other.getCurLevelRecord()); + } + if (other.getLICMPIDMCOI() != 0) { + setLICMPIDMCOI(other.getLICMPIDMCOI()); + } + internalGetMutableSkipFloorGrantedRewardItemMap().mergeFrom( + other.internalGetSkipFloorGrantedRewardItemMap()); + if (other.getValidFloorRecordList() != 0) { + setValidFloorRecordList(other.getValidFloorRecordList()); + } + if (other.hasMonthlyBrief()) { + mergeMonthlyBrief(other.getMonthlyBrief()); + } + internalGetMutableFloorOpenTimeMap().mergeFrom( + other.internalGetFloorOpenTimeMap()); + if (other.getABPDHMJNBKD() != 0) { + setABPDHMJNBKD(other.getABPDHMJNBKD()); + } + if (other.getTowerScheduleId() != 0) { + setTowerScheduleId(other.getTowerScheduleId()); + } + if (other.getIsFirstInteract() != false) { + setIsFirstInteract(other.getIsFirstInteract()); + } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); } - if (other.getFEOKMKFLOFI() != 0) { - setFEOKMKFLOFI(other.getFEOKMKFLOFI()); + if (other.getValidTowerRecordNum() != 0) { + setValidTowerRecordNum(other.getValidTowerRecordNum()); } - if (other.getCFHPLJKKOFG() != 0) { - setCFHPLJKKOFG(other.getCFHPLJKKOFG()); + if (other.getCommemorativeRewardId() != 0) { + setCommemorativeRewardId(other.getCommemorativeRewardId()); } - if (other.getNFLJLHDCPFJ() != 0) { - setNFLJLHDCPFJ(other.getNFLJLHDCPFJ()); + if (other.getIsFinishedEntranceFloor() != false) { + setIsFinishedEntranceFloor(other.getIsFinishedEntranceFloor()); } if (towerFloorRecordListBuilder_ == null) { if (!other.towerFloorRecordList_.isEmpty()) { if (towerFloorRecordList_.isEmpty()) { towerFloorRecordList_ = other.towerFloorRecordList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); } else { ensureTowerFloorRecordListIsMutable(); towerFloorRecordList_.addAll(other.towerFloorRecordList_); @@ -1488,7 +1511,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerAllDataRspOuterClass.Tow towerFloorRecordListBuilder_.dispose(); towerFloorRecordListBuilder_ = null; towerFloorRecordList_ = other.towerFloorRecordList_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); towerFloorRecordListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getTowerFloorRecordListFieldBuilder() : null; @@ -1497,36 +1520,11 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerAllDataRspOuterClass.Tow } } } - if (other.getJJJCPHMBMLG() != 0) { - setJJJCPHMBMLG(other.getJJJCPHMBMLG()); - } - if (other.getIsFirstInteract() != false) { - setIsFirstInteract(other.getIsFirstInteract()); - } - if (other.hasCurLevelRecord()) { - mergeCurLevelRecord(other.getCurLevelRecord()); - } if (other.hasLastScheduleMonthlyBrief()) { mergeLastScheduleMonthlyBrief(other.getLastScheduleMonthlyBrief()); } - internalGetMutableFloorOpenTimeMap().mergeFrom( - other.internalGetFloorOpenTimeMap()); - if (other.hasMonthlyBrief()) { - mergeMonthlyBrief(other.getMonthlyBrief()); - } - if (other.getNextScheduleChangeTime() != 0) { - setNextScheduleChangeTime(other.getNextScheduleChangeTime()); - } - if (other.getTowerScheduleId() != 0) { - setTowerScheduleId(other.getTowerScheduleId()); - } - internalGetMutableSkipFloorGrantedRewardItemMap().mergeFrom( - other.internalGetSkipFloorGrantedRewardItemMap()); - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } - if (other.getMOOJNLEAKFC() != 0) { - setMOOJNLEAKFC(other.getMOOJNLEAKFC()); + if (other.getScheduleStartTime() != 0) { + setScheduleStartTime(other.getScheduleStartTime()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -1558,699 +1556,463 @@ public Builder mergeFrom( } private int bitField0_; - private boolean isFinishedEntranceFloor_ ; + private int nextScheduleChangeTime_ ; /** - * bool is_finished_entrance_floor = 12; - * @return The isFinishedEntranceFloor. + * uint32 next_schedule_change_time = 1; + * @return The nextScheduleChangeTime. */ @java.lang.Override - public boolean getIsFinishedEntranceFloor() { - return isFinishedEntranceFloor_; + public int getNextScheduleChangeTime() { + return nextScheduleChangeTime_; } /** - * bool is_finished_entrance_floor = 12; - * @param value The isFinishedEntranceFloor to set. + * uint32 next_schedule_change_time = 1; + * @param value The nextScheduleChangeTime to set. * @return This builder for chaining. */ - public Builder setIsFinishedEntranceFloor(boolean value) { + public Builder setNextScheduleChangeTime(int value) { - isFinishedEntranceFloor_ = value; + nextScheduleChangeTime_ = value; onChanged(); return this; } /** - * bool is_finished_entrance_floor = 12; + * uint32 next_schedule_change_time = 1; * @return This builder for chaining. */ - public Builder clearIsFinishedEntranceFloor() { + public Builder clearNextScheduleChangeTime() { - isFinishedEntranceFloor_ = false; + nextScheduleChangeTime_ = 0; onChanged(); return this; } - private int scheduleStartTime_ ; + private emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord curLevelRecord_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder> curLevelRecordBuilder_; /** - * uint32 schedule_start_time = 1168; - * @return The scheduleStartTime. + * .TowerCurLevelRecord cur_level_record = 2; + * @return Whether the curLevelRecord field is set. */ - @java.lang.Override - public int getScheduleStartTime() { - return scheduleStartTime_; + public boolean hasCurLevelRecord() { + return curLevelRecordBuilder_ != null || curLevelRecord_ != null; } /** - * uint32 schedule_start_time = 1168; - * @param value The scheduleStartTime to set. - * @return This builder for chaining. + * .TowerCurLevelRecord cur_level_record = 2; + * @return The curLevelRecord. */ - public Builder setScheduleStartTime(int value) { - - scheduleStartTime_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord getCurLevelRecord() { + if (curLevelRecordBuilder_ == null) { + return curLevelRecord_ == null ? emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.getDefaultInstance() : curLevelRecord_; + } else { + return curLevelRecordBuilder_.getMessage(); + } } /** - * uint32 schedule_start_time = 1168; - * @return This builder for chaining. + * .TowerCurLevelRecord cur_level_record = 2; */ - public Builder clearScheduleStartTime() { - - scheduleStartTime_ = 0; - onChanged(); + public Builder setCurLevelRecord(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord value) { + if (curLevelRecordBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + curLevelRecord_ = value; + onChanged(); + } else { + curLevelRecordBuilder_.setMessage(value); + } + return this; } - - private int fEOKMKFLOFI_ ; /** - * uint32 FEOKMKFLOFI = 6; - * @return The fEOKMKFLOFI. + * .TowerCurLevelRecord cur_level_record = 2; */ - @java.lang.Override - public int getFEOKMKFLOFI() { - return fEOKMKFLOFI_; + public Builder setCurLevelRecord( + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder builderForValue) { + if (curLevelRecordBuilder_ == null) { + curLevelRecord_ = builderForValue.build(); + onChanged(); + } else { + curLevelRecordBuilder_.setMessage(builderForValue.build()); + } + + return this; } /** - * uint32 FEOKMKFLOFI = 6; - * @param value The fEOKMKFLOFI to set. - * @return This builder for chaining. + * .TowerCurLevelRecord cur_level_record = 2; */ - public Builder setFEOKMKFLOFI(int value) { - - fEOKMKFLOFI_ = value; - onChanged(); + public Builder mergeCurLevelRecord(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord value) { + if (curLevelRecordBuilder_ == null) { + if (curLevelRecord_ != null) { + curLevelRecord_ = + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.newBuilder(curLevelRecord_).mergeFrom(value).buildPartial(); + } else { + curLevelRecord_ = value; + } + onChanged(); + } else { + curLevelRecordBuilder_.mergeFrom(value); + } + return this; } /** - * uint32 FEOKMKFLOFI = 6; - * @return This builder for chaining. + * .TowerCurLevelRecord cur_level_record = 2; */ - public Builder clearFEOKMKFLOFI() { - - fEOKMKFLOFI_ = 0; - onChanged(); + public Builder clearCurLevelRecord() { + if (curLevelRecordBuilder_ == null) { + curLevelRecord_ = null; + onChanged(); + } else { + curLevelRecord_ = null; + curLevelRecordBuilder_ = null; + } + return this; } - - private int cFHPLJKKOFG_ ; /** - * uint32 CFHPLJKKOFG = 15; - * @return The cFHPLJKKOFG. + * .TowerCurLevelRecord cur_level_record = 2; */ - @java.lang.Override - public int getCFHPLJKKOFG() { - return cFHPLJKKOFG_; + public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder getCurLevelRecordBuilder() { + + onChanged(); + return getCurLevelRecordFieldBuilder().getBuilder(); } /** - * uint32 CFHPLJKKOFG = 15; - * @param value The cFHPLJKKOFG to set. - * @return This builder for chaining. + * .TowerCurLevelRecord cur_level_record = 2; */ - public Builder setCFHPLJKKOFG(int value) { - - cFHPLJKKOFG_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder() { + if (curLevelRecordBuilder_ != null) { + return curLevelRecordBuilder_.getMessageOrBuilder(); + } else { + return curLevelRecord_ == null ? + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.getDefaultInstance() : curLevelRecord_; + } } /** - * uint32 CFHPLJKKOFG = 15; - * @return This builder for chaining. + * .TowerCurLevelRecord cur_level_record = 2; */ - public Builder clearCFHPLJKKOFG() { - - cFHPLJKKOFG_ = 0; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder> + getCurLevelRecordFieldBuilder() { + if (curLevelRecordBuilder_ == null) { + curLevelRecordBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder>( + getCurLevelRecord(), + getParentForChildren(), + isClean()); + curLevelRecord_ = null; + } + return curLevelRecordBuilder_; } - private int nFLJLHDCPFJ_ ; + private int lICMPIDMCOI_ ; /** - * uint32 NFLJLHDCPFJ = 5; - * @return The nFLJLHDCPFJ. + * uint32 LICMPIDMCOI = 3; + * @return The lICMPIDMCOI. */ @java.lang.Override - public int getNFLJLHDCPFJ() { - return nFLJLHDCPFJ_; + public int getLICMPIDMCOI() { + return lICMPIDMCOI_; } /** - * uint32 NFLJLHDCPFJ = 5; - * @param value The nFLJLHDCPFJ to set. + * uint32 LICMPIDMCOI = 3; + * @param value The lICMPIDMCOI to set. * @return This builder for chaining. */ - public Builder setNFLJLHDCPFJ(int value) { + public Builder setLICMPIDMCOI(int value) { - nFLJLHDCPFJ_ = value; + lICMPIDMCOI_ = value; onChanged(); return this; } /** - * uint32 NFLJLHDCPFJ = 5; + * uint32 LICMPIDMCOI = 3; * @return This builder for chaining. */ - public Builder clearNFLJLHDCPFJ() { + public Builder clearLICMPIDMCOI() { - nFLJLHDCPFJ_ = 0; + lICMPIDMCOI_ = 0; onChanged(); return this; } - private java.util.List towerFloorRecordList_ = - java.util.Collections.emptyList(); - private void ensureTowerFloorRecordListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - towerFloorRecordList_ = new java.util.ArrayList(towerFloorRecordList_); - bitField0_ |= 0x00000001; - } + private com.google.protobuf.MapField< + java.lang.Integer, java.lang.Integer> skipFloorGrantedRewardItemMap_; + private com.google.protobuf.MapField + internalGetSkipFloorGrantedRewardItemMap() { + if (skipFloorGrantedRewardItemMap_ == null) { + return com.google.protobuf.MapField.emptyMapField( + SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry); + } + return skipFloorGrantedRewardItemMap_; } - - private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder> towerFloorRecordListBuilder_; - - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public java.util.List getTowerFloorRecordListList() { - if (towerFloorRecordListBuilder_ == null) { - return java.util.Collections.unmodifiableList(towerFloorRecordList_); - } else { - return towerFloorRecordListBuilder_.getMessageList(); + private com.google.protobuf.MapField + internalGetMutableSkipFloorGrantedRewardItemMap() { + onChanged();; + if (skipFloorGrantedRewardItemMap_ == null) { + skipFloorGrantedRewardItemMap_ = com.google.protobuf.MapField.newMapField( + SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry); + } + if (!skipFloorGrantedRewardItemMap_.isMutable()) { + skipFloorGrantedRewardItemMap_ = skipFloorGrantedRewardItemMap_.copy(); } + return skipFloorGrantedRewardItemMap_; + } + + public int getSkipFloorGrantedRewardItemMapCount() { + return internalGetSkipFloorGrantedRewardItemMap().getMap().size(); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - public int getTowerFloorRecordListCount() { - if (towerFloorRecordListBuilder_ == null) { - return towerFloorRecordList_.size(); - } else { - return towerFloorRecordListBuilder_.getCount(); - } + + @java.lang.Override + public boolean containsSkipFloorGrantedRewardItemMap( + int key) { + + return internalGetSkipFloorGrantedRewardItemMap().getMap().containsKey(key); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * Use {@link #getSkipFloorGrantedRewardItemMapMap()} instead. */ - public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index) { - if (towerFloorRecordListBuilder_ == null) { - return towerFloorRecordList_.get(index); - } else { - return towerFloorRecordListBuilder_.getMessage(index); - } + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getSkipFloorGrantedRewardItemMap() { + return getSkipFloorGrantedRewardItemMapMap(); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - public Builder setTowerFloorRecordList( - int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { - if (towerFloorRecordListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTowerFloorRecordListIsMutable(); - towerFloorRecordList_.set(index, value); - onChanged(); - } else { - towerFloorRecordListBuilder_.setMessage(index, value); - } - return this; + @java.lang.Override + + public java.util.Map getSkipFloorGrantedRewardItemMapMap() { + return internalGetSkipFloorGrantedRewardItemMap().getMap(); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - public Builder setTowerFloorRecordList( - int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { - if (towerFloorRecordListBuilder_ == null) { - ensureTowerFloorRecordListIsMutable(); - towerFloorRecordList_.set(index, builderForValue.build()); - onChanged(); - } else { - towerFloorRecordListBuilder_.setMessage(index, builderForValue.build()); - } - return this; + @java.lang.Override + + public int getSkipFloorGrantedRewardItemMapOrDefault( + int key, + int defaultValue) { + + java.util.Map map = + internalGetSkipFloorGrantedRewardItemMap().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - public Builder addTowerFloorRecordList(emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { - if (towerFloorRecordListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTowerFloorRecordListIsMutable(); - towerFloorRecordList_.add(value); - onChanged(); - } else { - towerFloorRecordListBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public Builder addTowerFloorRecordList( - int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { - if (towerFloorRecordListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTowerFloorRecordListIsMutable(); - towerFloorRecordList_.add(index, value); - onChanged(); - } else { - towerFloorRecordListBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public Builder addTowerFloorRecordList( - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { - if (towerFloorRecordListBuilder_ == null) { - ensureTowerFloorRecordListIsMutable(); - towerFloorRecordList_.add(builderForValue.build()); - onChanged(); - } else { - towerFloorRecordListBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public Builder addTowerFloorRecordList( - int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { - if (towerFloorRecordListBuilder_ == null) { - ensureTowerFloorRecordListIsMutable(); - towerFloorRecordList_.add(index, builderForValue.build()); - onChanged(); - } else { - towerFloorRecordListBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public Builder addAllTowerFloorRecordList( - java.lang.Iterable values) { - if (towerFloorRecordListBuilder_ == null) { - ensureTowerFloorRecordListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, towerFloorRecordList_); - onChanged(); - } else { - towerFloorRecordListBuilder_.addAllMessages(values); + @java.lang.Override + + public int getSkipFloorGrantedRewardItemMapOrThrow( + int key) { + + java.util.Map map = + internalGetSkipFloorGrantedRewardItemMap().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); } - return this; + return map.get(key); } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public Builder clearTowerFloorRecordList() { - if (towerFloorRecordListBuilder_ == null) { - towerFloorRecordList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - towerFloorRecordListBuilder_.clear(); - } + + public Builder clearSkipFloorGrantedRewardItemMap() { + internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap() + .clear(); return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - public Builder removeTowerFloorRecordList(int index) { - if (towerFloorRecordListBuilder_ == null) { - ensureTowerFloorRecordListIsMutable(); - towerFloorRecordList_.remove(index); - onChanged(); - } else { - towerFloorRecordListBuilder_.remove(index); - } + + public Builder removeSkipFloorGrantedRewardItemMap( + int key) { + + internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap() + .remove(key); return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder getTowerFloorRecordListBuilder( - int index) { - return getTowerFloorRecordListFieldBuilder().getBuilder(index); - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( - int index) { - if (towerFloorRecordListBuilder_ == null) { - return towerFloorRecordList_.get(index); } else { - return towerFloorRecordListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public java.util.List - getTowerFloorRecordListOrBuilderList() { - if (towerFloorRecordListBuilder_ != null) { - return towerFloorRecordListBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(towerFloorRecordList_); - } - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder addTowerFloorRecordListBuilder() { - return getTowerFloorRecordListFieldBuilder().addBuilder( - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.getDefaultInstance()); - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder addTowerFloorRecordListBuilder( - int index) { - return getTowerFloorRecordListFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.getDefaultInstance()); - } - /** - * repeated .TowerFloorRecord tower_floor_record_list = 14; - */ - public java.util.List - getTowerFloorRecordListBuilderList() { - return getTowerFloorRecordListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder> - getTowerFloorRecordListFieldBuilder() { - if (towerFloorRecordListBuilder_ == null) { - towerFloorRecordListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder>( - towerFloorRecordList_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - towerFloorRecordList_ = null; - } - return towerFloorRecordListBuilder_; - } - - private int jJJCPHMBMLG_ ; - /** - * uint32 JJJCPHMBMLG = 9; - * @return The jJJCPHMBMLG. + * Use alternate mutation accessors instead. */ - @java.lang.Override - public int getJJJCPHMBMLG() { - return jJJCPHMBMLG_; + @java.lang.Deprecated + public java.util.Map + getMutableSkipFloorGrantedRewardItemMap() { + return internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap(); } /** - * uint32 JJJCPHMBMLG = 9; - * @param value The jJJCPHMBMLG to set. - * @return This builder for chaining. + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - public Builder setJJJCPHMBMLG(int value) { + public Builder putSkipFloorGrantedRewardItemMap( + int key, + int value) { - jJJCPHMBMLG_ = value; - onChanged(); + + internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap() + .put(key, value); return this; } /** - * uint32 JJJCPHMBMLG = 9; - * @return This builder for chaining. + * map<uint32, uint32> skip_floor_granted_reward_item_map = 4; */ - public Builder clearJJJCPHMBMLG() { - - jJJCPHMBMLG_ = 0; - onChanged(); + + public Builder putAllSkipFloorGrantedRewardItemMap( + java.util.Map values) { + internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap() + .putAll(values); return this; } - private boolean isFirstInteract_ ; + private int validFloorRecordList_ ; /** - * bool is_first_interact = 7; - * @return The isFirstInteract. + * uint32 valid_floor_record_list = 5; + * @return The validFloorRecordList. */ @java.lang.Override - public boolean getIsFirstInteract() { - return isFirstInteract_; + public int getValidFloorRecordList() { + return validFloorRecordList_; } /** - * bool is_first_interact = 7; - * @param value The isFirstInteract to set. + * uint32 valid_floor_record_list = 5; + * @param value The validFloorRecordList to set. * @return This builder for chaining. */ - public Builder setIsFirstInteract(boolean value) { + public Builder setValidFloorRecordList(int value) { - isFirstInteract_ = value; + validFloorRecordList_ = value; onChanged(); return this; } /** - * bool is_first_interact = 7; + * uint32 valid_floor_record_list = 5; * @return This builder for chaining. */ - public Builder clearIsFirstInteract() { + public Builder clearValidFloorRecordList() { - isFirstInteract_ = false; + validFloorRecordList_ = 0; onChanged(); return this; } - private emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord curLevelRecord_; + private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief monthlyBrief_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder> curLevelRecordBuilder_; + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> monthlyBriefBuilder_; /** - * .TowerCurLevelRecord cur_level_record = 10; - * @return Whether the curLevelRecord field is set. + * .TowerMonthlyBrief monthly_brief = 6; + * @return Whether the monthlyBrief field is set. */ - public boolean hasCurLevelRecord() { - return curLevelRecordBuilder_ != null || curLevelRecord_ != null; + public boolean hasMonthlyBrief() { + return monthlyBriefBuilder_ != null || monthlyBrief_ != null; } /** - * .TowerCurLevelRecord cur_level_record = 10; - * @return The curLevelRecord. + * .TowerMonthlyBrief monthly_brief = 6; + * @return The monthlyBrief. */ - public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord getCurLevelRecord() { - if (curLevelRecordBuilder_ == null) { - return curLevelRecord_ == null ? emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.getDefaultInstance() : curLevelRecord_; + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief() { + if (monthlyBriefBuilder_ == null) { + return monthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; } else { - return curLevelRecordBuilder_.getMessage(); + return monthlyBriefBuilder_.getMessage(); } } /** - * .TowerCurLevelRecord cur_level_record = 10; + * .TowerMonthlyBrief monthly_brief = 6; */ - public Builder setCurLevelRecord(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord value) { - if (curLevelRecordBuilder_ == null) { + public Builder setMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { + if (monthlyBriefBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - curLevelRecord_ = value; + monthlyBrief_ = value; onChanged(); } else { - curLevelRecordBuilder_.setMessage(value); + monthlyBriefBuilder_.setMessage(value); } return this; } /** - * .TowerCurLevelRecord cur_level_record = 10; + * .TowerMonthlyBrief monthly_brief = 6; */ - public Builder setCurLevelRecord( - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder builderForValue) { - if (curLevelRecordBuilder_ == null) { - curLevelRecord_ = builderForValue.build(); + public Builder setMonthlyBrief( + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder builderForValue) { + if (monthlyBriefBuilder_ == null) { + monthlyBrief_ = builderForValue.build(); onChanged(); } else { - curLevelRecordBuilder_.setMessage(builderForValue.build()); + monthlyBriefBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .TowerCurLevelRecord cur_level_record = 10; + * .TowerMonthlyBrief monthly_brief = 6; */ - public Builder mergeCurLevelRecord(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord value) { - if (curLevelRecordBuilder_ == null) { - if (curLevelRecord_ != null) { - curLevelRecord_ = - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.newBuilder(curLevelRecord_).mergeFrom(value).buildPartial(); + public Builder mergeMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { + if (monthlyBriefBuilder_ == null) { + if (monthlyBrief_ != null) { + monthlyBrief_ = + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.newBuilder(monthlyBrief_).mergeFrom(value).buildPartial(); } else { - curLevelRecord_ = value; + monthlyBrief_ = value; } onChanged(); } else { - curLevelRecordBuilder_.mergeFrom(value); + monthlyBriefBuilder_.mergeFrom(value); } return this; } /** - * .TowerCurLevelRecord cur_level_record = 10; + * .TowerMonthlyBrief monthly_brief = 6; */ - public Builder clearCurLevelRecord() { - if (curLevelRecordBuilder_ == null) { - curLevelRecord_ = null; + public Builder clearMonthlyBrief() { + if (monthlyBriefBuilder_ == null) { + monthlyBrief_ = null; onChanged(); } else { - curLevelRecord_ = null; - curLevelRecordBuilder_ = null; + monthlyBrief_ = null; + monthlyBriefBuilder_ = null; } return this; } /** - * .TowerCurLevelRecord cur_level_record = 10; + * .TowerMonthlyBrief monthly_brief = 6; */ - public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder getCurLevelRecordBuilder() { + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder getMonthlyBriefBuilder() { onChanged(); - return getCurLevelRecordFieldBuilder().getBuilder(); - } - /** - * .TowerCurLevelRecord cur_level_record = 10; - */ - public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder() { - if (curLevelRecordBuilder_ != null) { - return curLevelRecordBuilder_.getMessageOrBuilder(); - } else { - return curLevelRecord_ == null ? - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.getDefaultInstance() : curLevelRecord_; - } - } - /** - * .TowerCurLevelRecord cur_level_record = 10; - */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder> - getCurLevelRecordFieldBuilder() { - if (curLevelRecordBuilder_ == null) { - curLevelRecordBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder>( - getCurLevelRecord(), - getParentForChildren(), - isClean()); - curLevelRecord_ = null; - } - return curLevelRecordBuilder_; - } - - private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief lastScheduleMonthlyBrief_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> lastScheduleMonthlyBriefBuilder_; - /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - * @return Whether the lastScheduleMonthlyBrief field is set. - */ - public boolean hasLastScheduleMonthlyBrief() { - return lastScheduleMonthlyBriefBuilder_ != null || lastScheduleMonthlyBrief_ != null; - } - /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - * @return The lastScheduleMonthlyBrief. - */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief() { - if (lastScheduleMonthlyBriefBuilder_ == null) { - return lastScheduleMonthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; - } else { - return lastScheduleMonthlyBriefBuilder_.getMessage(); - } - } - /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - */ - public Builder setLastScheduleMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { - if (lastScheduleMonthlyBriefBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - lastScheduleMonthlyBrief_ = value; - onChanged(); - } else { - lastScheduleMonthlyBriefBuilder_.setMessage(value); - } - - return this; - } - /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - */ - public Builder setLastScheduleMonthlyBrief( - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder builderForValue) { - if (lastScheduleMonthlyBriefBuilder_ == null) { - lastScheduleMonthlyBrief_ = builderForValue.build(); - onChanged(); - } else { - lastScheduleMonthlyBriefBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - */ - public Builder mergeLastScheduleMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { - if (lastScheduleMonthlyBriefBuilder_ == null) { - if (lastScheduleMonthlyBrief_ != null) { - lastScheduleMonthlyBrief_ = - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.newBuilder(lastScheduleMonthlyBrief_).mergeFrom(value).buildPartial(); - } else { - lastScheduleMonthlyBrief_ = value; - } - onChanged(); - } else { - lastScheduleMonthlyBriefBuilder_.mergeFrom(value); - } - - return this; - } - /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - */ - public Builder clearLastScheduleMonthlyBrief() { - if (lastScheduleMonthlyBriefBuilder_ == null) { - lastScheduleMonthlyBrief_ = null; - onChanged(); - } else { - lastScheduleMonthlyBrief_ = null; - lastScheduleMonthlyBriefBuilder_ = null; - } - - return this; - } - /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; - */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder getLastScheduleMonthlyBriefBuilder() { - - onChanged(); - return getLastScheduleMonthlyBriefFieldBuilder().getBuilder(); + return getMonthlyBriefFieldBuilder().getBuilder(); } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; + * .TowerMonthlyBrief monthly_brief = 6; */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder() { - if (lastScheduleMonthlyBriefBuilder_ != null) { - return lastScheduleMonthlyBriefBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder() { + if (monthlyBriefBuilder_ != null) { + return monthlyBriefBuilder_.getMessageOrBuilder(); } else { - return lastScheduleMonthlyBrief_ == null ? - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; + return monthlyBrief_ == null ? + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; } } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 4; + * .TowerMonthlyBrief monthly_brief = 6; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> - getLastScheduleMonthlyBriefFieldBuilder() { - if (lastScheduleMonthlyBriefBuilder_ == null) { - lastScheduleMonthlyBriefBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getMonthlyBriefFieldBuilder() { + if (monthlyBriefBuilder_ == null) { + monthlyBriefBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder>( - getLastScheduleMonthlyBrief(), + getMonthlyBrief(), getParentForChildren(), isClean()); - lastScheduleMonthlyBrief_ = null; + monthlyBrief_ = null; } - return lastScheduleMonthlyBriefBuilder_; + return monthlyBriefBuilder_; } private com.google.protobuf.MapField< @@ -2280,7 +2042,7 @@ public int getFloorOpenTimeMapCount() { return internalGetFloorOpenTimeMap().getMap().size(); } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ @java.lang.Override @@ -2298,7 +2060,7 @@ public java.util.Map getFloorOpenTimeMap() return getFloorOpenTimeMapMap(); } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ @java.lang.Override @@ -2306,7 +2068,7 @@ public java.util.Map getFloorOpenTimeMapMa return internalGetFloorOpenTimeMap().getMap(); } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ @java.lang.Override @@ -2319,7 +2081,7 @@ public int getFloorOpenTimeMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ @java.lang.Override @@ -2340,7 +2102,7 @@ public Builder clearFloorOpenTimeMap() { return this; } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ public Builder removeFloorOpenTimeMap( @@ -2359,7 +2121,7 @@ public Builder removeFloorOpenTimeMap( return internalGetMutableFloorOpenTimeMap().getMutableMap(); } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ public Builder putFloorOpenTimeMap( int key, @@ -2371,7 +2133,7 @@ public Builder putFloorOpenTimeMap( return this; } /** - * map<uint32, uint32> floor_open_time_map = 13; + * map<uint32, uint32> floor_open_time_map = 7; */ public Builder putAllFloorOpenTimeMap( @@ -2381,373 +2143,609 @@ public Builder putAllFloorOpenTimeMap( return this; } - private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief monthlyBrief_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> monthlyBriefBuilder_; + private int aBPDHMJNBKD_ ; /** - * .TowerMonthlyBrief monthly_brief = 120; - * @return Whether the monthlyBrief field is set. + * uint32 ABPDHMJNBKD = 8; + * @return The aBPDHMJNBKD. */ - public boolean hasMonthlyBrief() { - return monthlyBriefBuilder_ != null || monthlyBrief_ != null; + @java.lang.Override + public int getABPDHMJNBKD() { + return aBPDHMJNBKD_; } /** - * .TowerMonthlyBrief monthly_brief = 120; - * @return The monthlyBrief. + * uint32 ABPDHMJNBKD = 8; + * @param value The aBPDHMJNBKD to set. + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief() { - if (monthlyBriefBuilder_ == null) { - return monthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; - } else { - return monthlyBriefBuilder_.getMessage(); - } + public Builder setABPDHMJNBKD(int value) { + + aBPDHMJNBKD_ = value; + onChanged(); + return this; } /** - * .TowerMonthlyBrief monthly_brief = 120; + * uint32 ABPDHMJNBKD = 8; + * @return This builder for chaining. */ - public Builder setMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { - if (monthlyBriefBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - monthlyBrief_ = value; - onChanged(); - } else { - monthlyBriefBuilder_.setMessage(value); - } - + public Builder clearABPDHMJNBKD() { + + aBPDHMJNBKD_ = 0; + onChanged(); return this; } + + private int towerScheduleId_ ; /** - * .TowerMonthlyBrief monthly_brief = 120; + * uint32 tower_schedule_id = 9; + * @return The towerScheduleId. */ - public Builder setMonthlyBrief( - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder builderForValue) { - if (monthlyBriefBuilder_ == null) { - monthlyBrief_ = builderForValue.build(); - onChanged(); - } else { - monthlyBriefBuilder_.setMessage(builderForValue.build()); - } - + @java.lang.Override + public int getTowerScheduleId() { + return towerScheduleId_; + } + /** + * uint32 tower_schedule_id = 9; + * @param value The towerScheduleId to set. + * @return This builder for chaining. + */ + public Builder setTowerScheduleId(int value) { + + towerScheduleId_ = value; + onChanged(); return this; } /** - * .TowerMonthlyBrief monthly_brief = 120; + * uint32 tower_schedule_id = 9; + * @return This builder for chaining. */ - public Builder mergeMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { - if (monthlyBriefBuilder_ == null) { - if (monthlyBrief_ != null) { - monthlyBrief_ = - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.newBuilder(monthlyBrief_).mergeFrom(value).buildPartial(); - } else { - monthlyBrief_ = value; - } - onChanged(); - } else { - monthlyBriefBuilder_.mergeFrom(value); - } + public Builder clearTowerScheduleId() { + + towerScheduleId_ = 0; + onChanged(); + return this; + } + private boolean isFirstInteract_ ; + /** + * bool is_first_interact = 10; + * @return The isFirstInteract. + */ + @java.lang.Override + public boolean getIsFirstInteract() { + return isFirstInteract_; + } + /** + * bool is_first_interact = 10; + * @param value The isFirstInteract to set. + * @return This builder for chaining. + */ + public Builder setIsFirstInteract(boolean value) { + + isFirstInteract_ = value; + onChanged(); return this; } /** - * .TowerMonthlyBrief monthly_brief = 120; + * bool is_first_interact = 10; + * @return This builder for chaining. */ - public Builder clearMonthlyBrief() { - if (monthlyBriefBuilder_ == null) { - monthlyBrief_ = null; - onChanged(); - } else { - monthlyBrief_ = null; - monthlyBriefBuilder_ = null; - } + public Builder clearIsFirstInteract() { + + isFirstInteract_ = false; + onChanged(); + return this; + } + private int retcode_ ; + /** + * int32 retcode = 11; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 11; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); return this; } /** - * .TowerMonthlyBrief monthly_brief = 120; + * int32 retcode = 11; + * @return This builder for chaining. */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder getMonthlyBriefBuilder() { + public Builder clearRetcode() { + retcode_ = 0; onChanged(); - return getMonthlyBriefFieldBuilder().getBuilder(); + return this; } + + private int validTowerRecordNum_ ; /** - * .TowerMonthlyBrief monthly_brief = 120; + * uint32 valid_tower_record_num = 12; + * @return The validTowerRecordNum. */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder() { - if (monthlyBriefBuilder_ != null) { - return monthlyBriefBuilder_.getMessageOrBuilder(); - } else { - return monthlyBrief_ == null ? - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; - } + @java.lang.Override + public int getValidTowerRecordNum() { + return validTowerRecordNum_; } /** - * .TowerMonthlyBrief monthly_brief = 120; + * uint32 valid_tower_record_num = 12; + * @param value The validTowerRecordNum to set. + * @return This builder for chaining. */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> - getMonthlyBriefFieldBuilder() { - if (monthlyBriefBuilder_ == null) { - monthlyBriefBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder>( - getMonthlyBrief(), - getParentForChildren(), - isClean()); - monthlyBrief_ = null; - } - return monthlyBriefBuilder_; + public Builder setValidTowerRecordNum(int value) { + + validTowerRecordNum_ = value; + onChanged(); + return this; + } + /** + * uint32 valid_tower_record_num = 12; + * @return This builder for chaining. + */ + public Builder clearValidTowerRecordNum() { + + validTowerRecordNum_ = 0; + onChanged(); + return this; } - private int nextScheduleChangeTime_ ; + private int commemorativeRewardId_ ; /** - * uint32 next_schedule_change_time = 11; - * @return The nextScheduleChangeTime. + * uint32 commemorative_reward_id = 13; + * @return The commemorativeRewardId. */ @java.lang.Override - public int getNextScheduleChangeTime() { - return nextScheduleChangeTime_; + public int getCommemorativeRewardId() { + return commemorativeRewardId_; } /** - * uint32 next_schedule_change_time = 11; - * @param value The nextScheduleChangeTime to set. + * uint32 commemorative_reward_id = 13; + * @param value The commemorativeRewardId to set. * @return This builder for chaining. */ - public Builder setNextScheduleChangeTime(int value) { + public Builder setCommemorativeRewardId(int value) { - nextScheduleChangeTime_ = value; + commemorativeRewardId_ = value; onChanged(); return this; } /** - * uint32 next_schedule_change_time = 11; + * uint32 commemorative_reward_id = 13; * @return This builder for chaining. */ - public Builder clearNextScheduleChangeTime() { + public Builder clearCommemorativeRewardId() { - nextScheduleChangeTime_ = 0; + commemorativeRewardId_ = 0; onChanged(); return this; } - private int towerScheduleId_ ; + private boolean isFinishedEntranceFloor_ ; /** - * uint32 tower_schedule_id = 3; - * @return The towerScheduleId. + * bool is_finished_entrance_floor = 14; + * @return The isFinishedEntranceFloor. */ @java.lang.Override - public int getTowerScheduleId() { - return towerScheduleId_; + public boolean getIsFinishedEntranceFloor() { + return isFinishedEntranceFloor_; } /** - * uint32 tower_schedule_id = 3; - * @param value The towerScheduleId to set. + * bool is_finished_entrance_floor = 14; + * @param value The isFinishedEntranceFloor to set. * @return This builder for chaining. */ - public Builder setTowerScheduleId(int value) { + public Builder setIsFinishedEntranceFloor(boolean value) { - towerScheduleId_ = value; + isFinishedEntranceFloor_ = value; onChanged(); return this; } /** - * uint32 tower_schedule_id = 3; - * @return This builder for chaining. + * bool is_finished_entrance_floor = 14; + * @return This builder for chaining. + */ + public Builder clearIsFinishedEntranceFloor() { + + isFinishedEntranceFloor_ = false; + onChanged(); + return this; + } + + private java.util.List towerFloorRecordList_ = + java.util.Collections.emptyList(); + private void ensureTowerFloorRecordListIsMutable() { + if (!((bitField0_ & 0x00000004) != 0)) { + towerFloorRecordList_ = new java.util.ArrayList(towerFloorRecordList_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder> towerFloorRecordListBuilder_; + + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public java.util.List getTowerFloorRecordListList() { + if (towerFloorRecordListBuilder_ == null) { + return java.util.Collections.unmodifiableList(towerFloorRecordList_); + } else { + return towerFloorRecordListBuilder_.getMessageList(); + } + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public int getTowerFloorRecordListCount() { + if (towerFloorRecordListBuilder_ == null) { + return towerFloorRecordList_.size(); + } else { + return towerFloorRecordListBuilder_.getCount(); + } + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index) { + if (towerFloorRecordListBuilder_ == null) { + return towerFloorRecordList_.get(index); + } else { + return towerFloorRecordListBuilder_.getMessage(index); + } + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder setTowerFloorRecordList( + int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { + if (towerFloorRecordListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTowerFloorRecordListIsMutable(); + towerFloorRecordList_.set(index, value); + onChanged(); + } else { + towerFloorRecordListBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder setTowerFloorRecordList( + int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { + if (towerFloorRecordListBuilder_ == null) { + ensureTowerFloorRecordListIsMutable(); + towerFloorRecordList_.set(index, builderForValue.build()); + onChanged(); + } else { + towerFloorRecordListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder addTowerFloorRecordList(emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { + if (towerFloorRecordListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTowerFloorRecordListIsMutable(); + towerFloorRecordList_.add(value); + onChanged(); + } else { + towerFloorRecordListBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder addTowerFloorRecordList( + int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { + if (towerFloorRecordListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTowerFloorRecordListIsMutable(); + towerFloorRecordList_.add(index, value); + onChanged(); + } else { + towerFloorRecordListBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder addTowerFloorRecordList( + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { + if (towerFloorRecordListBuilder_ == null) { + ensureTowerFloorRecordListIsMutable(); + towerFloorRecordList_.add(builderForValue.build()); + onChanged(); + } else { + towerFloorRecordListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder addTowerFloorRecordList( + int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { + if (towerFloorRecordListBuilder_ == null) { + ensureTowerFloorRecordListIsMutable(); + towerFloorRecordList_.add(index, builderForValue.build()); + onChanged(); + } else { + towerFloorRecordListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder addAllTowerFloorRecordList( + java.lang.Iterable values) { + if (towerFloorRecordListBuilder_ == null) { + ensureTowerFloorRecordListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, towerFloorRecordList_); + onChanged(); + } else { + towerFloorRecordListBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder clearTowerFloorRecordList() { + if (towerFloorRecordListBuilder_ == null) { + towerFloorRecordList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + towerFloorRecordListBuilder_.clear(); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public Builder removeTowerFloorRecordList(int index) { + if (towerFloorRecordListBuilder_ == null) { + ensureTowerFloorRecordListIsMutable(); + towerFloorRecordList_.remove(index); + onChanged(); + } else { + towerFloorRecordListBuilder_.remove(index); + } + return this; + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder getTowerFloorRecordListBuilder( + int index) { + return getTowerFloorRecordListFieldBuilder().getBuilder(index); + } + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - public Builder clearTowerScheduleId() { - - towerScheduleId_ = 0; - onChanged(); - return this; - } - - private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> skipFloorGrantedRewardItemMap_; - private com.google.protobuf.MapField - internalGetSkipFloorGrantedRewardItemMap() { - if (skipFloorGrantedRewardItemMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry); + public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( + int index) { + if (towerFloorRecordListBuilder_ == null) { + return towerFloorRecordList_.get(index); } else { + return towerFloorRecordListBuilder_.getMessageOrBuilder(index); } - return skipFloorGrantedRewardItemMap_; } - private com.google.protobuf.MapField - internalGetMutableSkipFloorGrantedRewardItemMap() { - onChanged();; - if (skipFloorGrantedRewardItemMap_ == null) { - skipFloorGrantedRewardItemMap_ = com.google.protobuf.MapField.newMapField( - SkipFloorGrantedRewardItemMapDefaultEntryHolder.defaultEntry); - } - if (!skipFloorGrantedRewardItemMap_.isMutable()) { - skipFloorGrantedRewardItemMap_ = skipFloorGrantedRewardItemMap_.copy(); + /** + * repeated .TowerFloorRecord tower_floor_record_list = 15; + */ + public java.util.List + getTowerFloorRecordListOrBuilderList() { + if (towerFloorRecordListBuilder_ != null) { + return towerFloorRecordListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(towerFloorRecordList_); } - return skipFloorGrantedRewardItemMap_; - } - - public int getSkipFloorGrantedRewardItemMapCount() { - return internalGetSkipFloorGrantedRewardItemMap().getMap().size(); } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - - @java.lang.Override - public boolean containsSkipFloorGrantedRewardItemMap( - int key) { - - return internalGetSkipFloorGrantedRewardItemMap().getMap().containsKey(key); + public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder addTowerFloorRecordListBuilder() { + return getTowerFloorRecordListFieldBuilder().addBuilder( + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.getDefaultInstance()); } /** - * Use {@link #getSkipFloorGrantedRewardItemMapMap()} instead. + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - @java.lang.Override - @java.lang.Deprecated - public java.util.Map getSkipFloorGrantedRewardItemMap() { - return getSkipFloorGrantedRewardItemMapMap(); + public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder addTowerFloorRecordListBuilder( + int index) { + return getTowerFloorRecordListFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.getDefaultInstance()); } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * repeated .TowerFloorRecord tower_floor_record_list = 15; */ - @java.lang.Override - - public java.util.Map getSkipFloorGrantedRewardItemMapMap() { - return internalGetSkipFloorGrantedRewardItemMap().getMap(); + public java.util.List + getTowerFloorRecordListBuilderList() { + return getTowerFloorRecordListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder> + getTowerFloorRecordListFieldBuilder() { + if (towerFloorRecordListBuilder_ == null) { + towerFloorRecordListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder>( + towerFloorRecordList_, + ((bitField0_ & 0x00000004) != 0), + getParentForChildren(), + isClean()); + towerFloorRecordList_ = null; + } + return towerFloorRecordListBuilder_; } + + private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief lastScheduleMonthlyBrief_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> lastScheduleMonthlyBriefBuilder_; /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; + * @return Whether the lastScheduleMonthlyBrief field is set. */ - @java.lang.Override - - public int getSkipFloorGrantedRewardItemMapOrDefault( - int key, - int defaultValue) { - - java.util.Map map = - internalGetSkipFloorGrantedRewardItemMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; + public boolean hasLastScheduleMonthlyBrief() { + return lastScheduleMonthlyBriefBuilder_ != null || lastScheduleMonthlyBrief_ != null; } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; + * @return The lastScheduleMonthlyBrief. */ - @java.lang.Override - - public int getSkipFloorGrantedRewardItemMapOrThrow( - int key) { - - java.util.Map map = - internalGetSkipFloorGrantedRewardItemMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief() { + if (lastScheduleMonthlyBriefBuilder_ == null) { + return lastScheduleMonthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; + } else { + return lastScheduleMonthlyBriefBuilder_.getMessage(); } - return map.get(key); - } - - public Builder clearSkipFloorGrantedRewardItemMap() { - internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap() - .clear(); - return this; } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; */ + public Builder setLastScheduleMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { + if (lastScheduleMonthlyBriefBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + lastScheduleMonthlyBrief_ = value; + onChanged(); + } else { + lastScheduleMonthlyBriefBuilder_.setMessage(value); + } - public Builder removeSkipFloorGrantedRewardItemMap( - int key) { - - internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap() - .remove(key); return this; } /** - * Use alternate mutation accessors instead. + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; */ - @java.lang.Deprecated - public java.util.Map - getMutableSkipFloorGrantedRewardItemMap() { - return internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap(); + public Builder setLastScheduleMonthlyBrief( + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder builderForValue) { + if (lastScheduleMonthlyBriefBuilder_ == null) { + lastScheduleMonthlyBrief_ = builderForValue.build(); + onChanged(); + } else { + lastScheduleMonthlyBriefBuilder_.setMessage(builderForValue.build()); + } + + return this; } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; */ - public Builder putSkipFloorGrantedRewardItemMap( - int key, - int value) { - - - internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap() - .put(key, value); + public Builder mergeLastScheduleMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { + if (lastScheduleMonthlyBriefBuilder_ == null) { + if (lastScheduleMonthlyBrief_ != null) { + lastScheduleMonthlyBrief_ = + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.newBuilder(lastScheduleMonthlyBrief_).mergeFrom(value).buildPartial(); + } else { + lastScheduleMonthlyBrief_ = value; + } + onChanged(); + } else { + lastScheduleMonthlyBriefBuilder_.mergeFrom(value); + } + return this; } /** - * map<uint32, uint32> skip_floor_granted_reward_item_map = 8; + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; */ + public Builder clearLastScheduleMonthlyBrief() { + if (lastScheduleMonthlyBriefBuilder_ == null) { + lastScheduleMonthlyBrief_ = null; + onChanged(); + } else { + lastScheduleMonthlyBrief_ = null; + lastScheduleMonthlyBriefBuilder_ = null; + } - public Builder putAllSkipFloorGrantedRewardItemMap( - java.util.Map values) { - internalGetMutableSkipFloorGrantedRewardItemMap().getMutableMap() - .putAll(values); return this; } - - private int retcode_ ; /** - * int32 retcode = 2; - * @return The retcode. + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; */ - @java.lang.Override - public int getRetcode() { - return retcode_; + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder getLastScheduleMonthlyBriefBuilder() { + + onChanged(); + return getLastScheduleMonthlyBriefFieldBuilder().getBuilder(); } /** - * int32 retcode = 2; - * @param value The retcode to set. - * @return This builder for chaining. + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; */ - public Builder setRetcode(int value) { - - retcode_ = value; - onChanged(); - return this; + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder() { + if (lastScheduleMonthlyBriefBuilder_ != null) { + return lastScheduleMonthlyBriefBuilder_.getMessageOrBuilder(); + } else { + return lastScheduleMonthlyBrief_ == null ? + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; + } } /** - * int32 retcode = 2; - * @return This builder for chaining. + * .TowerMonthlyBrief last_schedule_monthly_brief = 598; */ - public Builder clearRetcode() { - - retcode_ = 0; - onChanged(); - return this; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> + getLastScheduleMonthlyBriefFieldBuilder() { + if (lastScheduleMonthlyBriefBuilder_ == null) { + lastScheduleMonthlyBriefBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder>( + getLastScheduleMonthlyBrief(), + getParentForChildren(), + isClean()); + lastScheduleMonthlyBrief_ = null; + } + return lastScheduleMonthlyBriefBuilder_; } - private int mOOJNLEAKFC_ ; + private int scheduleStartTime_ ; /** - * uint32 MOOJNLEAKFC = 1; - * @return The mOOJNLEAKFC. + * uint32 schedule_start_time = 1008; + * @return The scheduleStartTime. */ @java.lang.Override - public int getMOOJNLEAKFC() { - return mOOJNLEAKFC_; + public int getScheduleStartTime() { + return scheduleStartTime_; } /** - * uint32 MOOJNLEAKFC = 1; - * @param value The mOOJNLEAKFC to set. + * uint32 schedule_start_time = 1008; + * @param value The scheduleStartTime to set. * @return This builder for chaining. */ - public Builder setMOOJNLEAKFC(int value) { + public Builder setScheduleStartTime(int value) { - mOOJNLEAKFC_ = value; + scheduleStartTime_ = value; onChanged(); return this; } /** - * uint32 MOOJNLEAKFC = 1; + * uint32 schedule_start_time = 1008; * @return This builder for chaining. */ - public Builder clearMOOJNLEAKFC() { + public Builder clearScheduleStartTime() { - mOOJNLEAKFC_ = 0; + scheduleStartTime_ = 0; onChanged(); return this; } @@ -2810,15 +2808,15 @@ public emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp getDe com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_TowerAllDataRsp_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_descriptor; + internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_fieldAccessorTable; + internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_descriptor; + internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_fieldAccessorTable; + internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -2828,36 +2826,37 @@ public emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp getDe descriptor; static { java.lang.String[] descriptorData = { - "\n\025TowerAllDataRsp.proto\032\026TowerFloorRecor" + - "d.proto\032\031TowerCurLevelRecord.proto\032\027Towe" + - "rMonthlyBrief.proto\"\223\006\n\017TowerAllDataRsp\022" + - "\"\n\032is_finished_entrance_floor\030\014 \001(\010\022\034\n\023s" + - "chedule_start_time\030\220\t \001(\r\022\023\n\013FEOKMKFLOFI" + - "\030\006 \001(\r\022\023\n\013CFHPLJKKOFG\030\017 \001(\r\022\023\n\013NFLJLHDCP" + - "FJ\030\005 \001(\r\0222\n\027tower_floor_record_list\030\016 \003(" + - "\0132\021.TowerFloorRecord\022\023\n\013JJJCPHMBMLG\030\t \001(" + - "\r\022\031\n\021is_first_interact\030\007 \001(\010\022.\n\020cur_leve" + - "l_record\030\n \001(\0132\024.TowerCurLevelRecord\0227\n\033" + - "last_schedule_monthly_brief\030\004 \001(\0132\022.Towe" + - "rMonthlyBrief\022C\n\023floor_open_time_map\030\r \003" + - "(\0132&.TowerAllDataRsp.FloorOpenTimeMapEnt" + - "ry\022)\n\rmonthly_brief\030x \001(\0132\022.TowerMonthly" + - "Brief\022!\n\031next_schedule_change_time\030\013 \001(\r" + - "\022\031\n\021tower_schedule_id\030\003 \001(\r\022_\n\"skip_floo" + - "r_granted_reward_item_map\030\010 \003(\01323.TowerA" + - "llDataRsp.SkipFloorGrantedRewardItemMapE" + - "ntry\022\017\n\007retcode\030\002 \001(\005\022\023\n\013MOOJNLEAKFC\030\001 \001" + - "(\r\0327\n\025FloorOpenTimeMapEntry\022\013\n\003key\030\001 \001(\r" + - "\022\r\n\005value\030\002 \001(\r:\0028\001\032D\n\"SkipFloorGrantedR" + - "ewardItemMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" + - "\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006" + - "proto3" + "\n\025TowerAllDataRsp.proto\032\031TowerCurLevelRe" + + "cord.proto\032\026TowerFloorRecord.proto\032\027Towe" + + "rMonthlyBrief.proto\"\267\006\n\017TowerAllDataRsp\022" + + "!\n\031next_schedule_change_time\030\001 \001(\r\022.\n\020cu" + + "r_level_record\030\002 \001(\0132\024.TowerCurLevelReco" + + "rd\022\023\n\013LICMPIDMCOI\030\003 \001(\r\022_\n\"skip_floor_gr" + + "anted_reward_item_map\030\004 \003(\01323.TowerAllDa" + + "taRsp.SkipFloorGrantedRewardItemMapEntry" + + "\022\037\n\027valid_floor_record_list\030\005 \001(\r\022)\n\rmon" + + "thly_brief\030\006 \001(\0132\022.TowerMonthlyBrief\022C\n\023" + + "floor_open_time_map\030\007 \003(\0132&.TowerAllData" + + "Rsp.FloorOpenTimeMapEntry\022\023\n\013ABPDHMJNBKD" + + "\030\010 \001(\r\022\031\n\021tower_schedule_id\030\t \001(\r\022\031\n\021is_" + + "first_interact\030\n \001(\010\022\017\n\007retcode\030\013 \001(\005\022\036\n" + + "\026valid_tower_record_num\030\014 \001(\r\022\037\n\027commemo" + + "rative_reward_id\030\r \001(\r\022\"\n\032is_finished_en" + + "trance_floor\030\016 \001(\010\0222\n\027tower_floor_record" + + "_list\030\017 \003(\0132\021.TowerFloorRecord\0228\n\033last_s" + + "chedule_monthly_brief\030\326\004 \001(\0132\022.TowerMont" + + "hlyBrief\022\034\n\023schedule_start_time\030\360\007 \001(\r\032D" + + "\n\"SkipFloorGrantedRewardItemMapEntry\022\013\n\003" + + "key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\0327\n\025FloorOpe" + + "nTimeMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(" + + "\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006prot" + + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.getDescriptor(), emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.getDescriptor(), + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.getDescriptor(), emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.getDescriptor(), }); internal_static_TowerAllDataRsp_descriptor = @@ -2865,21 +2864,21 @@ public emu.grasscutter.net.proto.TowerAllDataRspOuterClass.TowerAllDataRsp getDe internal_static_TowerAllDataRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerAllDataRsp_descriptor, - new java.lang.String[] { "IsFinishedEntranceFloor", "ScheduleStartTime", "FEOKMKFLOFI", "CFHPLJKKOFG", "NFLJLHDCPFJ", "TowerFloorRecordList", "JJJCPHMBMLG", "IsFirstInteract", "CurLevelRecord", "LastScheduleMonthlyBrief", "FloorOpenTimeMap", "MonthlyBrief", "NextScheduleChangeTime", "TowerScheduleId", "SkipFloorGrantedRewardItemMap", "Retcode", "MOOJNLEAKFC", }); - internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_descriptor = + new java.lang.String[] { "NextScheduleChangeTime", "CurLevelRecord", "LICMPIDMCOI", "SkipFloorGrantedRewardItemMap", "ValidFloorRecordList", "MonthlyBrief", "FloorOpenTimeMap", "ABPDHMJNBKD", "TowerScheduleId", "IsFirstInteract", "Retcode", "ValidTowerRecordNum", "CommemorativeRewardId", "IsFinishedEntranceFloor", "TowerFloorRecordList", "LastScheduleMonthlyBrief", "ScheduleStartTime", }); + internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_descriptor = internal_static_TowerAllDataRsp_descriptor.getNestedTypes().get(0); - internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_fieldAccessorTable = new + internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_descriptor, + internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_descriptor = + internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_descriptor = internal_static_TowerAllDataRsp_descriptor.getNestedTypes().get(1); - internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_fieldAccessorTable = new + internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_TowerAllDataRsp_SkipFloorGrantedRewardItemMapEntry_descriptor, + internal_static_TowerAllDataRsp_FloorOpenTimeMapEntry_descriptor, new java.lang.String[] { "Key", "Value", }); - emu.grasscutter.net.proto.TowerFloorRecordOuterClass.getDescriptor(); emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.getDescriptor(); + emu.grasscutter.net.proto.TowerFloorRecordOuterClass.getDescriptor(); emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerBriefDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerBriefDataNotifyOuterClass.java index 47ef3814c89..d5edb6528de 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerBriefDataNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerBriefDataNotifyOuterClass.java @@ -19,51 +19,50 @@ public interface TowerBriefDataNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 IPKPGKDBNBL = 5; - * @return The iPKPGKDBNBL. + * bool is_finished_entrance_floor = 1; + * @return The isFinishedEntranceFloor. */ - int getIPKPGKDBNBL(); + boolean getIsFinishedEntranceFloor(); /** - * uint32 next_schedule_change_time = 15; - * @return The nextScheduleChangeTime. + * uint32 last_floor_index = 4; + * @return The lastFloorIndex. */ - int getNextScheduleChangeTime(); + int getLastFloorIndex(); /** - * uint32 tower_schedule_id = 9; - * @return The towerScheduleId. + * uint32 last_level_index = 8; + * @return The lastLevelIndex. */ - int getTowerScheduleId(); + int getLastLevelIndex(); /** - * uint32 schedule_start_time = 14; + * uint32 schedule_start_time = 9; * @return The scheduleStartTime. */ int getScheduleStartTime(); /** - * uint32 OJCGNKBJNBG = 13; - * @return The oJCGNKBJNBG. + * uint32 total_star_num = 10; + * @return The totalStarNum. */ - int getOJCGNKBJNBG(); + int getTotalStarNum(); /** - * uint32 CLDPGFCBJEA = 2; - * @return The cLDPGFCBJEA. + * uint32 next_schedule_change_time = 12; + * @return The nextScheduleChangeTime. */ - int getCLDPGFCBJEA(); + int getNextScheduleChangeTime(); /** - * bool is_finished_entrance_floor = 4; - * @return The isFinishedEntranceFloor. + * uint32 tower_schedule_id = 13; + * @return The towerScheduleId. */ - boolean getIsFinishedEntranceFloor(); + int getTowerScheduleId(); } /** * 
-   * CmdId: 28206
-   * Obf: FDNCNACOCMJ
+   * CmdId: 6643
    *
* * Protobuf type {@code TowerBriefDataNotify} @@ -110,39 +109,39 @@ private TowerBriefDataNotify( case 0: done = true; break; - case 16: { + case 8: { - cLDPGFCBJEA_ = input.readUInt32(); + isFinishedEntranceFloor_ = input.readBool(); break; } case 32: { - isFinishedEntranceFloor_ = input.readBool(); + lastFloorIndex_ = input.readUInt32(); break; } - case 40: { + case 64: { - iPKPGKDBNBL_ = input.readUInt32(); + lastLevelIndex_ = input.readUInt32(); break; } case 72: { - towerScheduleId_ = input.readUInt32(); + scheduleStartTime_ = input.readUInt32(); break; } - case 104: { + case 80: { - oJCGNKBJNBG_ = input.readUInt32(); + totalStarNum_ = input.readUInt32(); break; } - case 112: { + case 96: { - scheduleStartTime_ = input.readUInt32(); + nextScheduleChangeTime_ = input.readUInt32(); break; } - case 120: { + case 104: { - nextScheduleChangeTime_ = input.readUInt32(); + towerScheduleId_ = input.readUInt32(); break; } default: { @@ -177,43 +176,43 @@ private TowerBriefDataNotify( emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify.class, emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify.Builder.class); } - public static final int IPKPGKDBNBL_FIELD_NUMBER = 5; - private int iPKPGKDBNBL_; + public static final int IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER = 1; + private boolean isFinishedEntranceFloor_; /** - * uint32 IPKPGKDBNBL = 5; - * @return The iPKPGKDBNBL. + * bool is_finished_entrance_floor = 1; + * @return The isFinishedEntranceFloor. */ @java.lang.Override - public int getIPKPGKDBNBL() { - return iPKPGKDBNBL_; + public boolean getIsFinishedEntranceFloor() { + return isFinishedEntranceFloor_; } - public static final int NEXT_SCHEDULE_CHANGE_TIME_FIELD_NUMBER = 15; - private int nextScheduleChangeTime_; + public static final int LAST_FLOOR_INDEX_FIELD_NUMBER = 4; + private int lastFloorIndex_; /** - * uint32 next_schedule_change_time = 15; - * @return The nextScheduleChangeTime. + * uint32 last_floor_index = 4; + * @return The lastFloorIndex. */ @java.lang.Override - public int getNextScheduleChangeTime() { - return nextScheduleChangeTime_; + public int getLastFloorIndex() { + return lastFloorIndex_; } - public static final int TOWER_SCHEDULE_ID_FIELD_NUMBER = 9; - private int towerScheduleId_; + public static final int LAST_LEVEL_INDEX_FIELD_NUMBER = 8; + private int lastLevelIndex_; /** - * uint32 tower_schedule_id = 9; - * @return The towerScheduleId. + * uint32 last_level_index = 8; + * @return The lastLevelIndex. */ @java.lang.Override - public int getTowerScheduleId() { - return towerScheduleId_; + public int getLastLevelIndex() { + return lastLevelIndex_; } - public static final int SCHEDULE_START_TIME_FIELD_NUMBER = 14; + public static final int SCHEDULE_START_TIME_FIELD_NUMBER = 9; private int scheduleStartTime_; /** - * uint32 schedule_start_time = 14; + * uint32 schedule_start_time = 9; * @return The scheduleStartTime. */ @java.lang.Override @@ -221,37 +220,37 @@ public int getScheduleStartTime() { return scheduleStartTime_; } - public static final int OJCGNKBJNBG_FIELD_NUMBER = 13; - private int oJCGNKBJNBG_; + public static final int TOTAL_STAR_NUM_FIELD_NUMBER = 10; + private int totalStarNum_; /** - * uint32 OJCGNKBJNBG = 13; - * @return The oJCGNKBJNBG. + * uint32 total_star_num = 10; + * @return The totalStarNum. */ @java.lang.Override - public int getOJCGNKBJNBG() { - return oJCGNKBJNBG_; + public int getTotalStarNum() { + return totalStarNum_; } - public static final int CLDPGFCBJEA_FIELD_NUMBER = 2; - private int cLDPGFCBJEA_; + public static final int NEXT_SCHEDULE_CHANGE_TIME_FIELD_NUMBER = 12; + private int nextScheduleChangeTime_; /** - * uint32 CLDPGFCBJEA = 2; - * @return The cLDPGFCBJEA. + * uint32 next_schedule_change_time = 12; + * @return The nextScheduleChangeTime. */ @java.lang.Override - public int getCLDPGFCBJEA() { - return cLDPGFCBJEA_; + public int getNextScheduleChangeTime() { + return nextScheduleChangeTime_; } - public static final int IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER = 4; - private boolean isFinishedEntranceFloor_; + public static final int TOWER_SCHEDULE_ID_FIELD_NUMBER = 13; + private int towerScheduleId_; /** - * bool is_finished_entrance_floor = 4; - * @return The isFinishedEntranceFloor. + * uint32 tower_schedule_id = 13; + * @return The towerScheduleId. */ @java.lang.Override - public boolean getIsFinishedEntranceFloor() { - return isFinishedEntranceFloor_; + public int getTowerScheduleId() { + return towerScheduleId_; } private byte memoizedIsInitialized = -1; @@ -268,26 +267,26 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (cLDPGFCBJEA_ != 0) { - output.writeUInt32(2, cLDPGFCBJEA_); - } if (isFinishedEntranceFloor_ != false) { - output.writeBool(4, isFinishedEntranceFloor_); + output.writeBool(1, isFinishedEntranceFloor_); } - if (iPKPGKDBNBL_ != 0) { - output.writeUInt32(5, iPKPGKDBNBL_); - } - if (towerScheduleId_ != 0) { - output.writeUInt32(9, towerScheduleId_); + if (lastFloorIndex_ != 0) { + output.writeUInt32(4, lastFloorIndex_); } - if (oJCGNKBJNBG_ != 0) { - output.writeUInt32(13, oJCGNKBJNBG_); + if (lastLevelIndex_ != 0) { + output.writeUInt32(8, lastLevelIndex_); } if (scheduleStartTime_ != 0) { - output.writeUInt32(14, scheduleStartTime_); + output.writeUInt32(9, scheduleStartTime_); + } + if (totalStarNum_ != 0) { + output.writeUInt32(10, totalStarNum_); } if (nextScheduleChangeTime_ != 0) { - output.writeUInt32(15, nextScheduleChangeTime_); + output.writeUInt32(12, nextScheduleChangeTime_); + } + if (towerScheduleId_ != 0) { + output.writeUInt32(13, towerScheduleId_); } unknownFields.writeTo(output); } @@ -298,33 +297,33 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (cLDPGFCBJEA_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, cLDPGFCBJEA_); - } if (isFinishedEntranceFloor_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, isFinishedEntranceFloor_); + .computeBoolSize(1, isFinishedEntranceFloor_); } - if (iPKPGKDBNBL_ != 0) { + if (lastFloorIndex_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, iPKPGKDBNBL_); + .computeUInt32Size(4, lastFloorIndex_); } - if (towerScheduleId_ != 0) { + if (lastLevelIndex_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, towerScheduleId_); + .computeUInt32Size(8, lastLevelIndex_); } - if (oJCGNKBJNBG_ != 0) { + if (scheduleStartTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, oJCGNKBJNBG_); + .computeUInt32Size(9, scheduleStartTime_); } - if (scheduleStartTime_ != 0) { + if (totalStarNum_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(14, scheduleStartTime_); + .computeUInt32Size(10, totalStarNum_); } if (nextScheduleChangeTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, nextScheduleChangeTime_); + .computeUInt32Size(12, nextScheduleChangeTime_); + } + if (towerScheduleId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(13, towerScheduleId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -341,20 +340,20 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify other = (emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify) obj; - if (getIPKPGKDBNBL() - != other.getIPKPGKDBNBL()) return false; + if (getIsFinishedEntranceFloor() + != other.getIsFinishedEntranceFloor()) return false; + if (getLastFloorIndex() + != other.getLastFloorIndex()) return false; + if (getLastLevelIndex() + != other.getLastLevelIndex()) return false; + if (getScheduleStartTime() + != other.getScheduleStartTime()) return false; + if (getTotalStarNum() + != other.getTotalStarNum()) return false; if (getNextScheduleChangeTime() != other.getNextScheduleChangeTime()) return false; if (getTowerScheduleId() != other.getTowerScheduleId()) return false; - if (getScheduleStartTime() - != other.getScheduleStartTime()) return false; - if (getOJCGNKBJNBG() - != other.getOJCGNKBJNBG()) return false; - if (getCLDPGFCBJEA() - != other.getCLDPGFCBJEA()) return false; - if (getIsFinishedEntranceFloor() - != other.getIsFinishedEntranceFloor()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -366,21 +365,21 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + IPKPGKDBNBL_FIELD_NUMBER; - hash = (53 * hash) + getIPKPGKDBNBL(); + hash = (37 * hash) + IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsFinishedEntranceFloor()); + hash = (37 * hash) + LAST_FLOOR_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getLastFloorIndex(); + hash = (37 * hash) + LAST_LEVEL_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getLastLevelIndex(); + hash = (37 * hash) + SCHEDULE_START_TIME_FIELD_NUMBER; + hash = (53 * hash) + getScheduleStartTime(); + hash = (37 * hash) + TOTAL_STAR_NUM_FIELD_NUMBER; + hash = (53 * hash) + getTotalStarNum(); hash = (37 * hash) + NEXT_SCHEDULE_CHANGE_TIME_FIELD_NUMBER; hash = (53 * hash) + getNextScheduleChangeTime(); hash = (37 * hash) + TOWER_SCHEDULE_ID_FIELD_NUMBER; hash = (53 * hash) + getTowerScheduleId(); - hash = (37 * hash) + SCHEDULE_START_TIME_FIELD_NUMBER; - hash = (53 * hash) + getScheduleStartTime(); - hash = (37 * hash) + OJCGNKBJNBG_FIELD_NUMBER; - hash = (53 * hash) + getOJCGNKBJNBG(); - hash = (37 * hash) + CLDPGFCBJEA_FIELD_NUMBER; - hash = (53 * hash) + getCLDPGFCBJEA(); - hash = (37 * hash) + IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsFinishedEntranceFloor()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -478,8 +477,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 28206
-     * Obf: FDNCNACOCMJ
+     * CmdId: 6643
      *
* * Protobuf type {@code TowerBriefDataNotify} @@ -519,19 +517,19 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - iPKPGKDBNBL_ = 0; + isFinishedEntranceFloor_ = false; - nextScheduleChangeTime_ = 0; + lastFloorIndex_ = 0; - towerScheduleId_ = 0; + lastLevelIndex_ = 0; scheduleStartTime_ = 0; - oJCGNKBJNBG_ = 0; + totalStarNum_ = 0; - cLDPGFCBJEA_ = 0; + nextScheduleChangeTime_ = 0; - isFinishedEntranceFloor_ = false; + towerScheduleId_ = 0; return this; } @@ -559,13 +557,13 @@ public emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNo @java.lang.Override public emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify buildPartial() { emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify result = new emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify(this); - result.iPKPGKDBNBL_ = iPKPGKDBNBL_; + result.isFinishedEntranceFloor_ = isFinishedEntranceFloor_; + result.lastFloorIndex_ = lastFloorIndex_; + result.lastLevelIndex_ = lastLevelIndex_; + result.scheduleStartTime_ = scheduleStartTime_; + result.totalStarNum_ = totalStarNum_; result.nextScheduleChangeTime_ = nextScheduleChangeTime_; result.towerScheduleId_ = towerScheduleId_; - result.scheduleStartTime_ = scheduleStartTime_; - result.oJCGNKBJNBG_ = oJCGNKBJNBG_; - result.cLDPGFCBJEA_ = cLDPGFCBJEA_; - result.isFinishedEntranceFloor_ = isFinishedEntranceFloor_; onBuilt(); return result; } @@ -614,26 +612,26 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify other) { if (other == emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNotify.getDefaultInstance()) return this; - if (other.getIPKPGKDBNBL() != 0) { - setIPKPGKDBNBL(other.getIPKPGKDBNBL()); + if (other.getIsFinishedEntranceFloor() != false) { + setIsFinishedEntranceFloor(other.getIsFinishedEntranceFloor()); } - if (other.getNextScheduleChangeTime() != 0) { - setNextScheduleChangeTime(other.getNextScheduleChangeTime()); + if (other.getLastFloorIndex() != 0) { + setLastFloorIndex(other.getLastFloorIndex()); } - if (other.getTowerScheduleId() != 0) { - setTowerScheduleId(other.getTowerScheduleId()); + if (other.getLastLevelIndex() != 0) { + setLastLevelIndex(other.getLastLevelIndex()); } if (other.getScheduleStartTime() != 0) { setScheduleStartTime(other.getScheduleStartTime()); } - if (other.getOJCGNKBJNBG() != 0) { - setOJCGNKBJNBG(other.getOJCGNKBJNBG()); + if (other.getTotalStarNum() != 0) { + setTotalStarNum(other.getTotalStarNum()); } - if (other.getCLDPGFCBJEA() != 0) { - setCLDPGFCBJEA(other.getCLDPGFCBJEA()); + if (other.getNextScheduleChangeTime() != 0) { + setNextScheduleChangeTime(other.getNextScheduleChangeTime()); } - if (other.getIsFinishedEntranceFloor() != false) { - setIsFinishedEntranceFloor(other.getIsFinishedEntranceFloor()); + if (other.getTowerScheduleId() != 0) { + setTowerScheduleId(other.getTowerScheduleId()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -664,102 +662,102 @@ public Builder mergeFrom( return this; } - private int iPKPGKDBNBL_ ; + private boolean isFinishedEntranceFloor_ ; /** - * uint32 IPKPGKDBNBL = 5; - * @return The iPKPGKDBNBL. + * bool is_finished_entrance_floor = 1; + * @return The isFinishedEntranceFloor. */ @java.lang.Override - public int getIPKPGKDBNBL() { - return iPKPGKDBNBL_; + public boolean getIsFinishedEntranceFloor() { + return isFinishedEntranceFloor_; } /** - * uint32 IPKPGKDBNBL = 5; - * @param value The iPKPGKDBNBL to set. + * bool is_finished_entrance_floor = 1; + * @param value The isFinishedEntranceFloor to set. * @return This builder for chaining. */ - public Builder setIPKPGKDBNBL(int value) { + public Builder setIsFinishedEntranceFloor(boolean value) { - iPKPGKDBNBL_ = value; + isFinishedEntranceFloor_ = value; onChanged(); return this; } /** - * uint32 IPKPGKDBNBL = 5; + * bool is_finished_entrance_floor = 1; * @return This builder for chaining. */ - public Builder clearIPKPGKDBNBL() { + public Builder clearIsFinishedEntranceFloor() { - iPKPGKDBNBL_ = 0; + isFinishedEntranceFloor_ = false; onChanged(); return this; } - private int nextScheduleChangeTime_ ; + private int lastFloorIndex_ ; /** - * uint32 next_schedule_change_time = 15; - * @return The nextScheduleChangeTime. + * uint32 last_floor_index = 4; + * @return The lastFloorIndex. */ @java.lang.Override - public int getNextScheduleChangeTime() { - return nextScheduleChangeTime_; + public int getLastFloorIndex() { + return lastFloorIndex_; } /** - * uint32 next_schedule_change_time = 15; - * @param value The nextScheduleChangeTime to set. + * uint32 last_floor_index = 4; + * @param value The lastFloorIndex to set. * @return This builder for chaining. */ - public Builder setNextScheduleChangeTime(int value) { + public Builder setLastFloorIndex(int value) { - nextScheduleChangeTime_ = value; + lastFloorIndex_ = value; onChanged(); return this; } /** - * uint32 next_schedule_change_time = 15; + * uint32 last_floor_index = 4; * @return This builder for chaining. */ - public Builder clearNextScheduleChangeTime() { + public Builder clearLastFloorIndex() { - nextScheduleChangeTime_ = 0; + lastFloorIndex_ = 0; onChanged(); return this; } - private int towerScheduleId_ ; + private int lastLevelIndex_ ; /** - * uint32 tower_schedule_id = 9; - * @return The towerScheduleId. + * uint32 last_level_index = 8; + * @return The lastLevelIndex. */ @java.lang.Override - public int getTowerScheduleId() { - return towerScheduleId_; + public int getLastLevelIndex() { + return lastLevelIndex_; } /** - * uint32 tower_schedule_id = 9; - * @param value The towerScheduleId to set. + * uint32 last_level_index = 8; + * @param value The lastLevelIndex to set. * @return This builder for chaining. */ - public Builder setTowerScheduleId(int value) { + public Builder setLastLevelIndex(int value) { - towerScheduleId_ = value; + lastLevelIndex_ = value; onChanged(); return this; } /** - * uint32 tower_schedule_id = 9; + * uint32 last_level_index = 8; * @return This builder for chaining. */ - public Builder clearTowerScheduleId() { + public Builder clearLastLevelIndex() { - towerScheduleId_ = 0; + lastLevelIndex_ = 0; onChanged(); return this; } private int scheduleStartTime_ ; /** - * uint32 schedule_start_time = 14; + * uint32 schedule_start_time = 9; * @return The scheduleStartTime. */ @java.lang.Override @@ -767,7 +765,7 @@ public int getScheduleStartTime() { return scheduleStartTime_; } /** - * uint32 schedule_start_time = 14; + * uint32 schedule_start_time = 9; * @param value The scheduleStartTime to set. * @return This builder for chaining. */ @@ -778,7 +776,7 @@ public Builder setScheduleStartTime(int value) { return this; } /** - * uint32 schedule_start_time = 14; + * uint32 schedule_start_time = 9; * @return This builder for chaining. */ public Builder clearScheduleStartTime() { @@ -788,95 +786,95 @@ public Builder clearScheduleStartTime() { return this; } - private int oJCGNKBJNBG_ ; + private int totalStarNum_ ; /** - * uint32 OJCGNKBJNBG = 13; - * @return The oJCGNKBJNBG. + * uint32 total_star_num = 10; + * @return The totalStarNum. */ @java.lang.Override - public int getOJCGNKBJNBG() { - return oJCGNKBJNBG_; + public int getTotalStarNum() { + return totalStarNum_; } /** - * uint32 OJCGNKBJNBG = 13; - * @param value The oJCGNKBJNBG to set. + * uint32 total_star_num = 10; + * @param value The totalStarNum to set. * @return This builder for chaining. */ - public Builder setOJCGNKBJNBG(int value) { + public Builder setTotalStarNum(int value) { - oJCGNKBJNBG_ = value; + totalStarNum_ = value; onChanged(); return this; } /** - * uint32 OJCGNKBJNBG = 13; + * uint32 total_star_num = 10; * @return This builder for chaining. */ - public Builder clearOJCGNKBJNBG() { + public Builder clearTotalStarNum() { - oJCGNKBJNBG_ = 0; + totalStarNum_ = 0; onChanged(); return this; } - private int cLDPGFCBJEA_ ; + private int nextScheduleChangeTime_ ; /** - * uint32 CLDPGFCBJEA = 2; - * @return The cLDPGFCBJEA. + * uint32 next_schedule_change_time = 12; + * @return The nextScheduleChangeTime. */ @java.lang.Override - public int getCLDPGFCBJEA() { - return cLDPGFCBJEA_; + public int getNextScheduleChangeTime() { + return nextScheduleChangeTime_; } /** - * uint32 CLDPGFCBJEA = 2; - * @param value The cLDPGFCBJEA to set. + * uint32 next_schedule_change_time = 12; + * @param value The nextScheduleChangeTime to set. * @return This builder for chaining. */ - public Builder setCLDPGFCBJEA(int value) { + public Builder setNextScheduleChangeTime(int value) { - cLDPGFCBJEA_ = value; + nextScheduleChangeTime_ = value; onChanged(); return this; } /** - * uint32 CLDPGFCBJEA = 2; + * uint32 next_schedule_change_time = 12; * @return This builder for chaining. */ - public Builder clearCLDPGFCBJEA() { + public Builder clearNextScheduleChangeTime() { - cLDPGFCBJEA_ = 0; + nextScheduleChangeTime_ = 0; onChanged(); return this; } - private boolean isFinishedEntranceFloor_ ; + private int towerScheduleId_ ; /** - * bool is_finished_entrance_floor = 4; - * @return The isFinishedEntranceFloor. + * uint32 tower_schedule_id = 13; + * @return The towerScheduleId. */ @java.lang.Override - public boolean getIsFinishedEntranceFloor() { - return isFinishedEntranceFloor_; + public int getTowerScheduleId() { + return towerScheduleId_; } /** - * bool is_finished_entrance_floor = 4; - * @param value The isFinishedEntranceFloor to set. + * uint32 tower_schedule_id = 13; + * @param value The towerScheduleId to set. * @return This builder for chaining. */ - public Builder setIsFinishedEntranceFloor(boolean value) { + public Builder setTowerScheduleId(int value) { - isFinishedEntranceFloor_ = value; + towerScheduleId_ = value; onChanged(); return this; } /** - * bool is_finished_entrance_floor = 4; + * uint32 tower_schedule_id = 13; * @return This builder for chaining. */ - public Builder clearIsFinishedEntranceFloor() { + public Builder clearTowerScheduleId() { - isFinishedEntranceFloor_ = false; + towerScheduleId_ = 0; onChanged(); return this; } @@ -947,13 +945,14 @@ public emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNo descriptor; static { java.lang.String[] descriptorData = { - "\n\032TowerBriefDataNotify.proto\"\324\001\n\024TowerBr" + - "iefDataNotify\022\023\n\013IPKPGKDBNBL\030\005 \001(\r\022!\n\031ne" + - "xt_schedule_change_time\030\017 \001(\r\022\031\n\021tower_s" + - "chedule_id\030\t \001(\r\022\033\n\023schedule_start_time\030" + - "\016 \001(\r\022\023\n\013OJCGNKBJNBG\030\r \001(\r\022\023\n\013CLDPGFCBJE" + - "A\030\002 \001(\r\022\"\n\032is_finished_entrance_floor\030\004 " + - "\001(\010B\033\n\031emu.grasscutter.net.protob\006proto3" + "\n\032TowerBriefDataNotify.proto\"\341\001\n\024TowerBr" + + "iefDataNotify\022\"\n\032is_finished_entrance_fl" + + "oor\030\001 \001(\010\022\030\n\020last_floor_index\030\004 \001(\r\022\030\n\020l" + + "ast_level_index\030\010 \001(\r\022\033\n\023schedule_start_" + + "time\030\t \001(\r\022\026\n\016total_star_num\030\n \001(\r\022!\n\031ne" + + "xt_schedule_change_time\030\014 \001(\r\022\031\n\021tower_s" + + "chedule_id\030\r \001(\rB\033\n\031emu.grasscutter.net." + + "protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -964,7 +963,7 @@ public emu.grasscutter.net.proto.TowerBriefDataNotifyOuterClass.TowerBriefDataNo internal_static_TowerBriefDataNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerBriefDataNotify_descriptor, - new java.lang.String[] { "IPKPGKDBNBL", "NextScheduleChangeTime", "TowerScheduleId", "ScheduleStartTime", "OJCGNKBJNBG", "CLDPGFCBJEA", "IsFinishedEntranceFloor", }); + new java.lang.String[] { "IsFinishedEntranceFloor", "LastFloorIndex", "LastLevelIndex", "ScheduleStartTime", "TotalStarNum", "NextScheduleChangeTime", "TowerScheduleId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerCurLevelRecordChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerCurLevelRecordChangeNotifyOuterClass.java index 8424c4740bc..bcc389e9d62 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerCurLevelRecordChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerCurLevelRecordChangeNotifyOuterClass.java @@ -19,24 +19,23 @@ public interface TowerCurLevelRecordChangeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; * @return Whether the curLevelRecord field is set. */ boolean hasCurLevelRecord(); /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; * @return The curLevelRecord. */ emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord getCurLevelRecord(); /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder(); } /** * 
-   * CmdId: 2583
-   * Obf: PLJFJACFJAH
+   * CmdId: 7108
    *
* * Protobuf type {@code TowerCurLevelRecordChangeNotify} @@ -83,7 +82,7 @@ private TowerCurLevelRecordChangeNotify( case 0: done = true; break; - case 26: { + case 18: { emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder subBuilder = null; if (curLevelRecord_ != null) { subBuilder = curLevelRecord_.toBuilder(); @@ -128,10 +127,10 @@ private TowerCurLevelRecordChangeNotify( emu.grasscutter.net.proto.TowerCurLevelRecordChangeNotifyOuterClass.TowerCurLevelRecordChangeNotify.class, emu.grasscutter.net.proto.TowerCurLevelRecordChangeNotifyOuterClass.TowerCurLevelRecordChangeNotify.Builder.class); } - public static final int CUR_LEVEL_RECORD_FIELD_NUMBER = 3; + public static final int CUR_LEVEL_RECORD_FIELD_NUMBER = 2; private emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord curLevelRecord_; /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; * @return Whether the curLevelRecord field is set. */ @java.lang.Override @@ -139,7 +138,7 @@ public boolean hasCurLevelRecord() { return curLevelRecord_ != null; } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; * @return The curLevelRecord. */ @java.lang.Override @@ -147,7 +146,7 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelReco return curLevelRecord_ == null ? emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.getDefaultInstance() : curLevelRecord_; } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ @java.lang.Override public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder() { @@ -169,7 +168,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (curLevelRecord_ != null) { - output.writeMessage(3, getCurLevelRecord()); + output.writeMessage(2, getCurLevelRecord()); } unknownFields.writeTo(output); } @@ -182,7 +181,7 @@ public int getSerializedSize() { size = 0; if (curLevelRecord_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getCurLevelRecord()); + .computeMessageSize(2, getCurLevelRecord()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -316,8 +315,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2583
-     * Obf: PLJFJACFJAH
+     * CmdId: 7108
      *
* * Protobuf type {@code TowerCurLevelRecordChangeNotify} @@ -478,14 +476,14 @@ public Builder mergeFrom( private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder> curLevelRecordBuilder_; /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; * @return Whether the curLevelRecord field is set. */ public boolean hasCurLevelRecord() { return curLevelRecordBuilder_ != null || curLevelRecord_ != null; } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; * @return The curLevelRecord. */ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord getCurLevelRecord() { @@ -496,7 +494,7 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelReco } } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ public Builder setCurLevelRecord(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord value) { if (curLevelRecordBuilder_ == null) { @@ -512,7 +510,7 @@ public Builder setCurLevelRecord(emu.grasscutter.net.proto.TowerCurLevelRecordOu return this; } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ public Builder setCurLevelRecord( emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder builderForValue) { @@ -526,7 +524,7 @@ public Builder setCurLevelRecord( return this; } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ public Builder mergeCurLevelRecord(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord value) { if (curLevelRecordBuilder_ == null) { @@ -544,7 +542,7 @@ public Builder mergeCurLevelRecord(emu.grasscutter.net.proto.TowerCurLevelRecord return this; } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ public Builder clearCurLevelRecord() { if (curLevelRecordBuilder_ == null) { @@ -558,7 +556,7 @@ public Builder clearCurLevelRecord() { return this; } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder getCurLevelRecordBuilder() { @@ -566,7 +564,7 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelReco return getCurLevelRecordFieldBuilder().getBuilder(); } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder getCurLevelRecordOrBuilder() { if (curLevelRecordBuilder_ != null) { @@ -577,7 +575,7 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelReco } } /** - * .TowerCurLevelRecord cur_level_record = 3; + * .TowerCurLevelRecord cur_level_record = 2; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecordOrBuilder> @@ -662,7 +660,7 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordChangeNotifyOuterClass.Tower "\n%TowerCurLevelRecordChangeNotify.proto\032" + "\031TowerCurLevelRecord.proto\"Q\n\037TowerCurLe" + "velRecordChangeNotify\022.\n\020cur_level_recor" + - "d\030\003 \001(\0132\024.TowerCurLevelRecordB\033\n\031emu.gra" + + "d\030\002 \001(\0132\024.TowerCurLevelRecordB\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerCurLevelRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerCurLevelRecordOuterClass.java index d4897c81435..248f2ba081d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerCurLevelRecordOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerCurLevelRecordOuterClass.java @@ -19,43 +19,43 @@ public interface TowerCurLevelRecordOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .TowerTeam tower_team_list = 3; + * uint32 cur_floor_id = 1; + * @return The curFloorId. + */ + int getCurFloorId(); + + /** + * bool is_upper_part = 2; + * @return The isUpperPart. + */ + boolean getIsUpperPart(); + + /** + * repeated .TowerTeam tower_team_list = 7; */ java.util.List getTowerTeamListList(); /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getTowerTeamList(int index); /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ int getTowerTeamListCount(); /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ java.util.List getTowerTeamListOrBuilderList(); /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTowerTeamListOrBuilder( int index); /** - * bool is_upper_part = 7; - * @return The isUpperPart. - */ - boolean getIsUpperPart(); - - /** - * uint32 cur_floor_id = 13; - * @return The curFloorId. - */ - int getCurFloorId(); - - /** - * bool is_empty = 14; + * bool is_empty = 8; * @return The isEmpty. */ boolean getIsEmpty(); @@ -67,27 +67,23 @@ emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTowerTeamLis int getCurLevelIndex(); /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @return A list containing the buffIdList. */ java.util.List getBuffIdListList(); /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @return The count of buffIdList. */ int getBuffIdListCount(); /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @param index The index of the element to return. * @return The buffIdList at the given index. */ int getBuffIdList(int index); } /** - * 
-   * Obf: KJMLGFALEGC
-   *
- * * Protobuf type {@code TowerCurLevelRecord} */ public static final class TowerCurLevelRecord extends @@ -135,7 +131,17 @@ private TowerCurLevelRecord( case 0: done = true; break; - case 26: { + case 8: { + + curFloorId_ = input.readUInt32(); + break; + } + case 16: { + + isUpperPart_ = input.readBool(); + break; + } + case 58: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { towerTeamList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -144,12 +150,17 @@ private TowerCurLevelRecord( input.readMessage(emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.parser(), extensionRegistry)); break; } - case 56: { + case 64: { - isUpperPart_ = input.readBool(); + isEmpty_ = input.readBool(); break; } - case 64: { + case 88: { + + curLevelIndex_ = input.readUInt32(); + break; + } + case 120: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { buffIdList_ = newIntList(); mutable_bitField0_ |= 0x00000002; @@ -157,7 +168,7 @@ private TowerCurLevelRecord( buffIdList_.addInt(input.readUInt32()); break; } - case 66: { + case 122: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { @@ -170,21 +181,6 @@ private TowerCurLevelRecord( input.popLimit(limit); break; } - case 88: { - - curLevelIndex_ = input.readUInt32(); - break; - } - case 104: { - - curFloorId_ = input.readUInt32(); - break; - } - case 112: { - - isEmpty_ = input.readBool(); - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -223,17 +219,39 @@ private TowerCurLevelRecord( emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.class, emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.Builder.class); } - public static final int TOWER_TEAM_LIST_FIELD_NUMBER = 3; + public static final int CUR_FLOOR_ID_FIELD_NUMBER = 1; + private int curFloorId_; + /** + * uint32 cur_floor_id = 1; + * @return The curFloorId. + */ + @java.lang.Override + public int getCurFloorId() { + return curFloorId_; + } + + public static final int IS_UPPER_PART_FIELD_NUMBER = 2; + private boolean isUpperPart_; + /** + * bool is_upper_part = 2; + * @return The isUpperPart. + */ + @java.lang.Override + public boolean getIsUpperPart() { + return isUpperPart_; + } + + public static final int TOWER_TEAM_LIST_FIELD_NUMBER = 7; private java.util.List towerTeamList_; /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ @java.lang.Override public java.util.List getTowerTeamListList() { return towerTeamList_; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ @java.lang.Override public java.util.List @@ -241,21 +259,21 @@ public java.util.List g return towerTeamList_; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ @java.lang.Override public int getTowerTeamListCount() { return towerTeamList_.size(); } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ @java.lang.Override public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getTowerTeamList(int index) { return towerTeamList_.get(index); } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ @java.lang.Override public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTowerTeamListOrBuilder( @@ -263,32 +281,10 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTower return towerTeamList_.get(index); } - public static final int IS_UPPER_PART_FIELD_NUMBER = 7; - private boolean isUpperPart_; - /** - * bool is_upper_part = 7; - * @return The isUpperPart. - */ - @java.lang.Override - public boolean getIsUpperPart() { - return isUpperPart_; - } - - public static final int CUR_FLOOR_ID_FIELD_NUMBER = 13; - private int curFloorId_; - /** - * uint32 cur_floor_id = 13; - * @return The curFloorId. - */ - @java.lang.Override - public int getCurFloorId() { - return curFloorId_; - } - - public static final int IS_EMPTY_FIELD_NUMBER = 14; + public static final int IS_EMPTY_FIELD_NUMBER = 8; private boolean isEmpty_; /** - * bool is_empty = 14; + * bool is_empty = 8; * @return The isEmpty. */ @java.lang.Override @@ -307,10 +303,10 @@ public int getCurLevelIndex() { return curLevelIndex_; } - public static final int BUFF_ID_LIST_FIELD_NUMBER = 8; + public static final int BUFF_ID_LIST_FIELD_NUMBER = 15; private com.google.protobuf.Internal.IntList buffIdList_; /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @return A list containing the buffIdList. */ @java.lang.Override @@ -319,14 +315,14 @@ public int getCurLevelIndex() { return buffIdList_; } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @return The count of buffIdList. */ public int getBuffIdListCount() { return buffIdList_.size(); } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @param index The index of the element to return. * @return The buffIdList at the given index. */ @@ -350,27 +346,27 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - for (int i = 0; i < towerTeamList_.size(); i++) { - output.writeMessage(3, towerTeamList_.get(i)); + if (curFloorId_ != 0) { + output.writeUInt32(1, curFloorId_); } if (isUpperPart_ != false) { - output.writeBool(7, isUpperPart_); + output.writeBool(2, isUpperPart_); } - if (getBuffIdListList().size() > 0) { - output.writeUInt32NoTag(66); - output.writeUInt32NoTag(buffIdListMemoizedSerializedSize); + for (int i = 0; i < towerTeamList_.size(); i++) { + output.writeMessage(7, towerTeamList_.get(i)); } - for (int i = 0; i < buffIdList_.size(); i++) { - output.writeUInt32NoTag(buffIdList_.getInt(i)); + if (isEmpty_ != false) { + output.writeBool(8, isEmpty_); } if (curLevelIndex_ != 0) { output.writeUInt32(11, curLevelIndex_); } - if (curFloorId_ != 0) { - output.writeUInt32(13, curFloorId_); + if (getBuffIdListList().size() > 0) { + output.writeUInt32NoTag(122); + output.writeUInt32NoTag(buffIdListMemoizedSerializedSize); } - if (isEmpty_ != false) { - output.writeBool(14, isEmpty_); + for (int i = 0; i < buffIdList_.size(); i++) { + output.writeUInt32NoTag(buffIdList_.getInt(i)); } unknownFields.writeTo(output); } @@ -381,13 +377,25 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - for (int i = 0; i < towerTeamList_.size(); i++) { + if (curFloorId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, towerTeamList_.get(i)); + .computeUInt32Size(1, curFloorId_); } if (isUpperPart_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(7, isUpperPart_); + .computeBoolSize(2, isUpperPart_); + } + for (int i = 0; i < towerTeamList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, towerTeamList_.get(i)); + } + if (isEmpty_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(8, isEmpty_); + } + if (curLevelIndex_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(11, curLevelIndex_); } { int dataSize = 0; @@ -403,18 +411,6 @@ public int getSerializedSize() { } buffIdListMemoizedSerializedSize = dataSize; } - if (curLevelIndex_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, curLevelIndex_); - } - if (curFloorId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, curFloorId_); - } - if (isEmpty_ != false) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(14, isEmpty_); - } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -430,12 +426,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord other = (emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord) obj; - if (!getTowerTeamListList() - .equals(other.getTowerTeamListList())) return false; - if (getIsUpperPart() - != other.getIsUpperPart()) return false; if (getCurFloorId() != other.getCurFloorId()) return false; + if (getIsUpperPart() + != other.getIsUpperPart()) return false; + if (!getTowerTeamListList() + .equals(other.getTowerTeamListList())) return false; if (getIsEmpty() != other.getIsEmpty()) return false; if (getCurLevelIndex() @@ -453,15 +449,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + CUR_FLOOR_ID_FIELD_NUMBER; + hash = (53 * hash) + getCurFloorId(); + hash = (37 * hash) + IS_UPPER_PART_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsUpperPart()); if (getTowerTeamListCount() > 0) { hash = (37 * hash) + TOWER_TEAM_LIST_FIELD_NUMBER; hash = (53 * hash) + getTowerTeamListList().hashCode(); } - hash = (37 * hash) + IS_UPPER_PART_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIsUpperPart()); - hash = (37 * hash) + CUR_FLOOR_ID_FIELD_NUMBER; - hash = (53 * hash) + getCurFloorId(); hash = (37 * hash) + IS_EMPTY_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsEmpty()); @@ -567,10 +563,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: KJMLGFALEGC
-     *
- * * Protobuf type {@code TowerCurLevelRecord} */ public static final class Builder extends @@ -609,16 +601,16 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + curFloorId_ = 0; + + isUpperPart_ = false; + if (towerTeamListBuilder_ == null) { towerTeamList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { towerTeamListBuilder_.clear(); } - isUpperPart_ = false; - - curFloorId_ = 0; - isEmpty_ = false; curLevelIndex_ = 0; @@ -652,6 +644,8 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelReco public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord buildPartial() { emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord result = new emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord(this); int from_bitField0_ = bitField0_; + result.curFloorId_ = curFloorId_; + result.isUpperPart_ = isUpperPart_; if (towerTeamListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { towerTeamList_ = java.util.Collections.unmodifiableList(towerTeamList_); @@ -661,8 +655,6 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelReco } else { result.towerTeamList_ = towerTeamListBuilder_.build(); } - result.isUpperPart_ = isUpperPart_; - result.curFloorId_ = curFloorId_; result.isEmpty_ = isEmpty_; result.curLevelIndex_ = curLevelIndex_; if (((bitField0_ & 0x00000002) != 0)) { @@ -718,6 +710,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord other) { if (other == emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelRecord.getDefaultInstance()) return this; + if (other.getCurFloorId() != 0) { + setCurFloorId(other.getCurFloorId()); + } + if (other.getIsUpperPart() != false) { + setIsUpperPart(other.getIsUpperPart()); + } if (towerTeamListBuilder_ == null) { if (!other.towerTeamList_.isEmpty()) { if (towerTeamList_.isEmpty()) { @@ -744,12 +742,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass } } } - if (other.getIsUpperPart() != false) { - setIsUpperPart(other.getIsUpperPart()); - } - if (other.getCurFloorId() != 0) { - setCurFloorId(other.getCurFloorId()); - } if (other.getIsEmpty() != false) { setIsEmpty(other.getIsEmpty()); } @@ -796,6 +788,68 @@ public Builder mergeFrom( } private int bitField0_; + private int curFloorId_ ; + /** + * uint32 cur_floor_id = 1; + * @return The curFloorId. + */ + @java.lang.Override + public int getCurFloorId() { + return curFloorId_; + } + /** + * uint32 cur_floor_id = 1; + * @param value The curFloorId to set. + * @return This builder for chaining. + */ + public Builder setCurFloorId(int value) { + + curFloorId_ = value; + onChanged(); + return this; + } + /** + * uint32 cur_floor_id = 1; + * @return This builder for chaining. + */ + public Builder clearCurFloorId() { + + curFloorId_ = 0; + onChanged(); + return this; + } + + private boolean isUpperPart_ ; + /** + * bool is_upper_part = 2; + * @return The isUpperPart. + */ + @java.lang.Override + public boolean getIsUpperPart() { + return isUpperPart_; + } + /** + * bool is_upper_part = 2; + * @param value The isUpperPart to set. + * @return This builder for chaining. + */ + public Builder setIsUpperPart(boolean value) { + + isUpperPart_ = value; + onChanged(); + return this; + } + /** + * bool is_upper_part = 2; + * @return This builder for chaining. + */ + public Builder clearIsUpperPart() { + + isUpperPart_ = false; + onChanged(); + return this; + } + private java.util.List towerTeamList_ = java.util.Collections.emptyList(); private void ensureTowerTeamListIsMutable() { @@ -809,7 +863,7 @@ private void ensureTowerTeamListIsMutable() { emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder> towerTeamListBuilder_; /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public java.util.List getTowerTeamListList() { if (towerTeamListBuilder_ == null) { @@ -819,7 +873,7 @@ public java.util.List g } } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public int getTowerTeamListCount() { if (towerTeamListBuilder_ == null) { @@ -829,7 +883,7 @@ public int getTowerTeamListCount() { } } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getTowerTeamList(int index) { if (towerTeamListBuilder_ == null) { @@ -839,7 +893,7 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getTowerTeamList( } } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder setTowerTeamList( int index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam value) { @@ -856,7 +910,7 @@ public Builder setTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder setTowerTeamList( int index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder builderForValue) { @@ -870,7 +924,7 @@ public Builder setTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder addTowerTeamList(emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam value) { if (towerTeamListBuilder_ == null) { @@ -886,7 +940,7 @@ public Builder addTowerTeamList(emu.grasscutter.net.proto.TowerTeamOuterClass.To return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder addTowerTeamList( int index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam value) { @@ -903,7 +957,7 @@ public Builder addTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder addTowerTeamList( emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder builderForValue) { @@ -917,7 +971,7 @@ public Builder addTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder addTowerTeamList( int index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder builderForValue) { @@ -931,7 +985,7 @@ public Builder addTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder addAllTowerTeamList( java.lang.Iterable values) { @@ -946,7 +1000,7 @@ public Builder addAllTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder clearTowerTeamList() { if (towerTeamListBuilder_ == null) { @@ -959,7 +1013,7 @@ public Builder clearTowerTeamList() { return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public Builder removeTowerTeamList(int index) { if (towerTeamListBuilder_ == null) { @@ -972,14 +1026,14 @@ public Builder removeTowerTeamList(int index) { return this; } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder getTowerTeamListBuilder( int index) { return getTowerTeamListFieldBuilder().getBuilder(index); } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTowerTeamListOrBuilder( int index) { @@ -989,7 +1043,7 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTower } } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public java.util.List getTowerTeamListOrBuilderList() { @@ -1000,14 +1054,14 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTower } } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder addTowerTeamListBuilder() { return getTowerTeamListFieldBuilder().addBuilder( emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.getDefaultInstance()); } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder addTowerTeamListBuilder( int index) { @@ -1015,7 +1069,7 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder addTowerT index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.getDefaultInstance()); } /** - * repeated .TowerTeam tower_team_list = 3; + * repeated .TowerTeam tower_team_list = 7; */ public java.util.List getTowerTeamListBuilderList() { @@ -1036,71 +1090,9 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder addTowerT return towerTeamListBuilder_; } - private boolean isUpperPart_ ; - /** - * bool is_upper_part = 7; - * @return The isUpperPart. - */ - @java.lang.Override - public boolean getIsUpperPart() { - return isUpperPart_; - } - /** - * bool is_upper_part = 7; - * @param value The isUpperPart to set. - * @return This builder for chaining. - */ - public Builder setIsUpperPart(boolean value) { - - isUpperPart_ = value; - onChanged(); - return this; - } - /** - * bool is_upper_part = 7; - * @return This builder for chaining. - */ - public Builder clearIsUpperPart() { - - isUpperPart_ = false; - onChanged(); - return this; - } - - private int curFloorId_ ; - /** - * uint32 cur_floor_id = 13; - * @return The curFloorId. - */ - @java.lang.Override - public int getCurFloorId() { - return curFloorId_; - } - /** - * uint32 cur_floor_id = 13; - * @param value The curFloorId to set. - * @return This builder for chaining. - */ - public Builder setCurFloorId(int value) { - - curFloorId_ = value; - onChanged(); - return this; - } - /** - * uint32 cur_floor_id = 13; - * @return This builder for chaining. - */ - public Builder clearCurFloorId() { - - curFloorId_ = 0; - onChanged(); - return this; - } - private boolean isEmpty_ ; /** - * bool is_empty = 14; + * bool is_empty = 8; * @return The isEmpty. */ @java.lang.Override @@ -1108,7 +1100,7 @@ public boolean getIsEmpty() { return isEmpty_; } /** - * bool is_empty = 14; + * bool is_empty = 8; * @param value The isEmpty to set. * @return This builder for chaining. */ @@ -1119,7 +1111,7 @@ public Builder setIsEmpty(boolean value) { return this; } /** - * bool is_empty = 14; + * bool is_empty = 8; * @return This builder for chaining. */ public Builder clearIsEmpty() { @@ -1168,7 +1160,7 @@ private void ensureBuffIdListIsMutable() { } } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @return A list containing the buffIdList. */ public java.util.List @@ -1177,14 +1169,14 @@ private void ensureBuffIdListIsMutable() { java.util.Collections.unmodifiableList(buffIdList_) : buffIdList_; } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @return The count of buffIdList. */ public int getBuffIdListCount() { return buffIdList_.size(); } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @param index The index of the element to return. * @return The buffIdList at the given index. */ @@ -1192,7 +1184,7 @@ public int getBuffIdList(int index) { return buffIdList_.getInt(index); } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @param index The index to set the value at. * @param value The buffIdList to set. * @return This builder for chaining. @@ -1205,7 +1197,7 @@ public Builder setBuffIdList( return this; } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @param value The buffIdList to add. * @return This builder for chaining. */ @@ -1216,7 +1208,7 @@ public Builder addBuffIdList(int value) { return this; } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @param values The buffIdList to add. * @return This builder for chaining. */ @@ -1229,7 +1221,7 @@ public Builder addAllBuffIdList( return this; } /** - * repeated uint32 buff_id_list = 8; + * repeated uint32 buff_id_list = 15; * @return This builder for chaining. */ public Builder clearBuffIdList() { @@ -1306,11 +1298,11 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelReco static { java.lang.String[] descriptorData = { "\n\031TowerCurLevelRecord.proto\032\017TowerTeam.p" + - "roto\"\250\001\n\023TowerCurLevelRecord\022#\n\017tower_te" + - "am_list\030\003 \003(\0132\n.TowerTeam\022\025\n\ris_upper_pa" + - "rt\030\007 \001(\010\022\024\n\014cur_floor_id\030\r \001(\r\022\020\n\010is_emp" + - "ty\030\016 \001(\010\022\027\n\017cur_level_index\030\013 \001(\r\022\024\n\014buf" + - "f_id_list\030\010 \003(\rB\033\n\031emu.grasscutter.net.p" + + "roto\"\250\001\n\023TowerCurLevelRecord\022\024\n\014cur_floo" + + "r_id\030\001 \001(\r\022\025\n\ris_upper_part\030\002 \001(\010\022#\n\017tow" + + "er_team_list\030\007 \003(\0132\n.TowerTeam\022\020\n\010is_emp" + + "ty\030\010 \001(\010\022\027\n\017cur_level_index\030\013 \001(\r\022\024\n\014buf" + + "f_id_list\030\017 \003(\rB\033\n\031emu.grasscutter.net.p" + "rotob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -1323,7 +1315,7 @@ public emu.grasscutter.net.proto.TowerCurLevelRecordOuterClass.TowerCurLevelReco internal_static_TowerCurLevelRecord_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerCurLevelRecord_descriptor, - new java.lang.String[] { "TowerTeamList", "IsUpperPart", "CurFloorId", "IsEmpty", "CurLevelIndex", "BuffIdList", }); + new java.lang.String[] { "CurFloorId", "IsUpperPart", "TowerTeamList", "IsEmpty", "CurLevelIndex", "BuffIdList", }); emu.grasscutter.net.proto.TowerTeamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerDailyRewardProgressChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerDailyRewardProgressChangeNotifyOuterClass.java index 6eeab81337c..de1bbeb1e83 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerDailyRewardProgressChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerDailyRewardProgressChangeNotifyOuterClass.java @@ -19,21 +19,21 @@ public interface TowerDailyRewardProgressChangeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 JJJCPHMBMLG = 9; - * @return The jJJCPHMBMLG. + * uint32 MICBOPDAEFN = 3; + * @return The mICBOPDAEFN. */ - int getJJJCPHMBMLG(); + int getMICBOPDAEFN(); /** - * uint32 NFLJLHDCPFJ = 8; - * @return The nFLJLHDCPFJ. + * uint32 NNIGLOKAEAI = 10; + * @return The nNIGLOKAEAI. */ - int getNFLJLHDCPFJ(); + int getNNIGLOKAEAI(); } /** * 
-   * CmdId: 8485
-   * Obf: DPACOEFBBJP
+   * 4.6.0
+   * CmdId: 26940
    *
* * Protobuf type {@code TowerDailyRewardProgressChangeNotify} @@ -80,14 +80,14 @@ private TowerDailyRewardProgressChangeNotify( case 0: done = true; break; - case 64: { + case 24: { - nFLJLHDCPFJ_ = input.readUInt32(); + mICBOPDAEFN_ = input.readUInt32(); break; } - case 72: { + case 80: { - jJJCPHMBMLG_ = input.readUInt32(); + nNIGLOKAEAI_ = input.readUInt32(); break; } default: { @@ -122,26 +122,26 @@ private TowerDailyRewardProgressChangeNotify( emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify.class, emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify.Builder.class); } - public static final int JJJCPHMBMLG_FIELD_NUMBER = 9; - private int jJJCPHMBMLG_; + public static final int MICBOPDAEFN_FIELD_NUMBER = 3; + private int mICBOPDAEFN_; /** - * uint32 JJJCPHMBMLG = 9; - * @return The jJJCPHMBMLG. + * uint32 MICBOPDAEFN = 3; + * @return The mICBOPDAEFN. */ @java.lang.Override - public int getJJJCPHMBMLG() { - return jJJCPHMBMLG_; + public int getMICBOPDAEFN() { + return mICBOPDAEFN_; } - public static final int NFLJLHDCPFJ_FIELD_NUMBER = 8; - private int nFLJLHDCPFJ_; + public static final int NNIGLOKAEAI_FIELD_NUMBER = 10; + private int nNIGLOKAEAI_; /** - * uint32 NFLJLHDCPFJ = 8; - * @return The nFLJLHDCPFJ. + * uint32 NNIGLOKAEAI = 10; + * @return The nNIGLOKAEAI. */ @java.lang.Override - public int getNFLJLHDCPFJ() { - return nFLJLHDCPFJ_; + public int getNNIGLOKAEAI() { + return nNIGLOKAEAI_; } private byte memoizedIsInitialized = -1; @@ -158,11 +158,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (nFLJLHDCPFJ_ != 0) { - output.writeUInt32(8, nFLJLHDCPFJ_); + if (mICBOPDAEFN_ != 0) { + output.writeUInt32(3, mICBOPDAEFN_); } - if (jJJCPHMBMLG_ != 0) { - output.writeUInt32(9, jJJCPHMBMLG_); + if (nNIGLOKAEAI_ != 0) { + output.writeUInt32(10, nNIGLOKAEAI_); } unknownFields.writeTo(output); } @@ -173,13 +173,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (nFLJLHDCPFJ_ != 0) { + if (mICBOPDAEFN_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, nFLJLHDCPFJ_); + .computeUInt32Size(3, mICBOPDAEFN_); } - if (jJJCPHMBMLG_ != 0) { + if (nNIGLOKAEAI_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, jJJCPHMBMLG_); + .computeUInt32Size(10, nNIGLOKAEAI_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +196,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify other = (emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify) obj; - if (getJJJCPHMBMLG() - != other.getJJJCPHMBMLG()) return false; - if (getNFLJLHDCPFJ() - != other.getNFLJLHDCPFJ()) return false; + if (getMICBOPDAEFN() + != other.getMICBOPDAEFN()) return false; + if (getNNIGLOKAEAI() + != other.getNNIGLOKAEAI()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +211,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + JJJCPHMBMLG_FIELD_NUMBER; - hash = (53 * hash) + getJJJCPHMBMLG(); - hash = (37 * hash) + NFLJLHDCPFJ_FIELD_NUMBER; - hash = (53 * hash) + getNFLJLHDCPFJ(); + hash = (37 * hash) + MICBOPDAEFN_FIELD_NUMBER; + hash = (53 * hash) + getMICBOPDAEFN(); + hash = (37 * hash) + NNIGLOKAEAI_FIELD_NUMBER; + hash = (53 * hash) + getNNIGLOKAEAI(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +312,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 8485
-     * Obf: DPACOEFBBJP
+     * 4.6.0
+     * CmdId: 26940
      *
* * Protobuf type {@code TowerDailyRewardProgressChangeNotify} @@ -353,9 +353,9 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - jJJCPHMBMLG_ = 0; + mICBOPDAEFN_ = 0; - nFLJLHDCPFJ_ = 0; + nNIGLOKAEAI_ = 0; return this; } @@ -383,8 +383,8 @@ public emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass. @java.lang.Override public emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify buildPartial() { emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify result = new emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify(this); - result.jJJCPHMBMLG_ = jJJCPHMBMLG_; - result.nFLJLHDCPFJ_ = nFLJLHDCPFJ_; + result.mICBOPDAEFN_ = mICBOPDAEFN_; + result.nNIGLOKAEAI_ = nNIGLOKAEAI_; onBuilt(); return result; } @@ -433,11 +433,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify other) { if (other == emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass.TowerDailyRewardProgressChangeNotify.getDefaultInstance()) return this; - if (other.getJJJCPHMBMLG() != 0) { - setJJJCPHMBMLG(other.getJJJCPHMBMLG()); + if (other.getMICBOPDAEFN() != 0) { + setMICBOPDAEFN(other.getMICBOPDAEFN()); } - if (other.getNFLJLHDCPFJ() != 0) { - setNFLJLHDCPFJ(other.getNFLJLHDCPFJ()); + if (other.getNNIGLOKAEAI() != 0) { + setNNIGLOKAEAI(other.getNNIGLOKAEAI()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -468,64 +468,64 @@ public Builder mergeFrom( return this; } - private int jJJCPHMBMLG_ ; + private int mICBOPDAEFN_ ; /** - * uint32 JJJCPHMBMLG = 9; - * @return The jJJCPHMBMLG. + * uint32 MICBOPDAEFN = 3; + * @return The mICBOPDAEFN. */ @java.lang.Override - public int getJJJCPHMBMLG() { - return jJJCPHMBMLG_; + public int getMICBOPDAEFN() { + return mICBOPDAEFN_; } /** - * uint32 JJJCPHMBMLG = 9; - * @param value The jJJCPHMBMLG to set. + * uint32 MICBOPDAEFN = 3; + * @param value The mICBOPDAEFN to set. * @return This builder for chaining. */ - public Builder setJJJCPHMBMLG(int value) { + public Builder setMICBOPDAEFN(int value) { - jJJCPHMBMLG_ = value; + mICBOPDAEFN_ = value; onChanged(); return this; } /** - * uint32 JJJCPHMBMLG = 9; + * uint32 MICBOPDAEFN = 3; * @return This builder for chaining. */ - public Builder clearJJJCPHMBMLG() { + public Builder clearMICBOPDAEFN() { - jJJCPHMBMLG_ = 0; + mICBOPDAEFN_ = 0; onChanged(); return this; } - private int nFLJLHDCPFJ_ ; + private int nNIGLOKAEAI_ ; /** - * uint32 NFLJLHDCPFJ = 8; - * @return The nFLJLHDCPFJ. + * uint32 NNIGLOKAEAI = 10; + * @return The nNIGLOKAEAI. */ @java.lang.Override - public int getNFLJLHDCPFJ() { - return nFLJLHDCPFJ_; + public int getNNIGLOKAEAI() { + return nNIGLOKAEAI_; } /** - * uint32 NFLJLHDCPFJ = 8; - * @param value The nFLJLHDCPFJ to set. + * uint32 NNIGLOKAEAI = 10; + * @param value The nNIGLOKAEAI to set. * @return This builder for chaining. */ - public Builder setNFLJLHDCPFJ(int value) { + public Builder setNNIGLOKAEAI(int value) { - nFLJLHDCPFJ_ = value; + nNIGLOKAEAI_ = value; onChanged(); return this; } /** - * uint32 NFLJLHDCPFJ = 8; + * uint32 NNIGLOKAEAI = 10; * @return This builder for chaining. */ - public Builder clearNFLJLHDCPFJ() { + public Builder clearNNIGLOKAEAI() { - nFLJLHDCPFJ_ = 0; + nNIGLOKAEAI_ = 0; onChanged(); return this; } @@ -598,8 +598,8 @@ public emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass. java.lang.String[] descriptorData = { "\n*TowerDailyRewardProgressChangeNotify.p" + "roto\"P\n$TowerDailyRewardProgressChangeNo" + - "tify\022\023\n\013JJJCPHMBMLG\030\t \001(\r\022\023\n\013NFLJLHDCPFJ" + - "\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + + "tify\022\023\n\013MICBOPDAEFN\030\003 \001(\r\022\023\n\013NNIGLOKAEAI" + + "\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -611,7 +611,7 @@ public emu.grasscutter.net.proto.TowerDailyRewardProgressChangeNotifyOuterClass. internal_static_TowerDailyRewardProgressChangeNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerDailyRewardProgressChangeNotify_descriptor, - new java.lang.String[] { "JJJCPHMBMLG", "NFLJLHDCPFJ", }); + new java.lang.String[] { "MICBOPDAEFN", "NNIGLOKAEAI", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerEnterLevelReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerEnterLevelReqOuterClass.java index fec9f6c68e8..37d6de7265b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerEnterLevelReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerEnterLevelReqOuterClass.java @@ -19,15 +19,14 @@ public interface TowerEnterLevelReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 enter_point_id = 5; + * uint32 enter_point_id = 2; * @return The enterPointId. */ int getEnterPointId(); } /** * 
-   * CmdId: 21406
-   * Obf: OFJGAEGGHFE
+   * CmdId: 22746
    *
* * Protobuf type {@code TowerEnterLevelReq} @@ -74,7 +73,7 @@ private TowerEnterLevelReq( case 0: done = true; break; - case 40: { + case 16: { enterPointId_ = input.readUInt32(); break; @@ -111,10 +110,10 @@ private TowerEnterLevelReq( emu.grasscutter.net.proto.TowerEnterLevelReqOuterClass.TowerEnterLevelReq.class, emu.grasscutter.net.proto.TowerEnterLevelReqOuterClass.TowerEnterLevelReq.Builder.class); } - public static final int ENTER_POINT_ID_FIELD_NUMBER = 5; + public static final int ENTER_POINT_ID_FIELD_NUMBER = 2; private int enterPointId_; /** - * uint32 enter_point_id = 5; + * uint32 enter_point_id = 2; * @return The enterPointId. */ @java.lang.Override @@ -137,7 +136,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (enterPointId_ != 0) { - output.writeUInt32(5, enterPointId_); + output.writeUInt32(2, enterPointId_); } unknownFields.writeTo(output); } @@ -150,7 +149,7 @@ public int getSerializedSize() { size = 0; if (enterPointId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, enterPointId_); + .computeUInt32Size(2, enterPointId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +278,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 21406
-     * Obf: OFJGAEGGHFE
+     * CmdId: 22746
      *
* * Protobuf type {@code TowerEnterLevelReq} @@ -431,7 +429,7 @@ public Builder mergeFrom( private int enterPointId_ ; /** - * uint32 enter_point_id = 5; + * uint32 enter_point_id = 2; * @return The enterPointId. */ @java.lang.Override @@ -439,7 +437,7 @@ public int getEnterPointId() { return enterPointId_; } /** - * uint32 enter_point_id = 5; + * uint32 enter_point_id = 2; * @param value The enterPointId to set. * @return This builder for chaining. */ @@ -450,7 +448,7 @@ public Builder setEnterPointId(int value) { return this; } /** - * uint32 enter_point_id = 5; + * uint32 enter_point_id = 2; * @return This builder for chaining. */ public Builder clearEnterPointId() { @@ -527,7 +525,7 @@ public emu.grasscutter.net.proto.TowerEnterLevelReqOuterClass.TowerEnterLevelReq static { java.lang.String[] descriptorData = { "\n\030TowerEnterLevelReq.proto\",\n\022TowerEnter" + - "LevelReq\022\026\n\016enter_point_id\030\005 \001(\rB\033\n\031emu." + + "LevelReq\022\026\n\016enter_point_id\030\002 \001(\rB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerEnterLevelRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerEnterLevelRspOuterClass.java index 07caf054321..62a7c867c4d 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerEnterLevelRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerEnterLevelRspOuterClass.java @@ -19,44 +19,43 @@ public interface TowerEnterLevelRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 level_index = 9; - * @return The levelIndex. - */ - int getLevelIndex(); - - /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @return A list containing the towerBuffIdList. */ java.util.List getTowerBuffIdListList(); /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @return The count of towerBuffIdList. */ int getTowerBuffIdListCount(); /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @param index The index of the element to return. * @return The towerBuffIdList at the given index. */ int getTowerBuffIdList(int index); /** - * int32 retcode = 4; - * @return The retcode. + * uint32 floor_id = 9; + * @return The floorId. */ - int getRetcode(); + int getFloorId(); /** - * uint32 floor_id = 11; - * @return The floorId. + * uint32 level_index = 12; + * @return The levelIndex. */ - int getFloorId(); + int getLevelIndex(); + + /** + * int32 retcode = 14; + * @return The retcode. + */ + int getRetcode(); } /** * 
-   * CmdId: 26115
-   * Obf: KHHHPNPIIGJ
+   * CmdId: 21726
    *
* * Protobuf type {@code TowerEnterLevelRsp} @@ -105,22 +104,7 @@ private TowerEnterLevelRsp( case 0: done = true; break; - case 32: { - - retcode_ = input.readInt32(); - break; - } - case 72: { - - levelIndex_ = input.readUInt32(); - break; - } - case 88: { - - floorId_ = input.readUInt32(); - break; - } - case 96: { + case 40: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { towerBuffIdList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -128,7 +112,7 @@ private TowerEnterLevelRsp( towerBuffIdList_.addInt(input.readUInt32()); break; } - case 98: { + case 42: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -141,6 +125,21 @@ private TowerEnterLevelRsp( input.popLimit(limit); break; } + case 72: { + + floorId_ = input.readUInt32(); + break; + } + case 96: { + + levelIndex_ = input.readUInt32(); + break; + } + case 112: { + + retcode_ = input.readInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -176,21 +175,10 @@ private TowerEnterLevelRsp( emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp.class, emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp.Builder.class); } - public static final int LEVEL_INDEX_FIELD_NUMBER = 9; - private int levelIndex_; - /** - * uint32 level_index = 9; - * @return The levelIndex. - */ - @java.lang.Override - public int getLevelIndex() { - return levelIndex_; - } - - public static final int TOWER_BUFF_ID_LIST_FIELD_NUMBER = 12; + public static final int TOWER_BUFF_ID_LIST_FIELD_NUMBER = 5; private com.google.protobuf.Internal.IntList towerBuffIdList_; /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @return A list containing the towerBuffIdList. */ @java.lang.Override @@ -199,14 +187,14 @@ public int getLevelIndex() { return towerBuffIdList_; } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @return The count of towerBuffIdList. */ public int getTowerBuffIdListCount() { return towerBuffIdList_.size(); } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @param index The index of the element to return. * @return The towerBuffIdList at the given index. */ @@ -215,26 +203,37 @@ public int getTowerBuffIdList(int index) { } private int towerBuffIdListMemoizedSerializedSize = -1; - public static final int RETCODE_FIELD_NUMBER = 4; - private int retcode_; + public static final int FLOOR_ID_FIELD_NUMBER = 9; + private int floorId_; /** - * int32 retcode = 4; - * @return The retcode. + * uint32 floor_id = 9; + * @return The floorId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getFloorId() { + return floorId_; } - public static final int FLOOR_ID_FIELD_NUMBER = 11; - private int floorId_; + public static final int LEVEL_INDEX_FIELD_NUMBER = 12; + private int levelIndex_; /** - * uint32 floor_id = 11; - * @return The floorId. + * uint32 level_index = 12; + * @return The levelIndex. */ @java.lang.Override - public int getFloorId() { - return floorId_; + public int getLevelIndex() { + return levelIndex_; + } + + public static final int RETCODE_FIELD_NUMBER = 14; + private int retcode_; + /** + * int32 retcode = 14; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; } private byte memoizedIsInitialized = -1; @@ -252,22 +251,22 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (retcode_ != 0) { - output.writeInt32(4, retcode_); - } - if (levelIndex_ != 0) { - output.writeUInt32(9, levelIndex_); - } - if (floorId_ != 0) { - output.writeUInt32(11, floorId_); - } if (getTowerBuffIdListList().size() > 0) { - output.writeUInt32NoTag(98); + output.writeUInt32NoTag(42); output.writeUInt32NoTag(towerBuffIdListMemoizedSerializedSize); } for (int i = 0; i < towerBuffIdList_.size(); i++) { output.writeUInt32NoTag(towerBuffIdList_.getInt(i)); } + if (floorId_ != 0) { + output.writeUInt32(9, floorId_); + } + if (levelIndex_ != 0) { + output.writeUInt32(12, levelIndex_); + } + if (retcode_ != 0) { + output.writeInt32(14, retcode_); + } unknownFields.writeTo(output); } @@ -277,18 +276,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, retcode_); - } - if (levelIndex_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, levelIndex_); - } - if (floorId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, floorId_); - } { int dataSize = 0; for (int i = 0; i < towerBuffIdList_.size(); i++) { @@ -303,6 +290,18 @@ public int getSerializedSize() { } towerBuffIdListMemoizedSerializedSize = dataSize; } + if (floorId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(9, floorId_); + } + if (levelIndex_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(12, levelIndex_); + } + if (retcode_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(14, retcode_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -318,14 +317,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp other = (emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp) obj; - if (getLevelIndex() - != other.getLevelIndex()) return false; if (!getTowerBuffIdListList() .equals(other.getTowerBuffIdListList())) return false; - if (getRetcode() - != other.getRetcode()) return false; if (getFloorId() != other.getFloorId()) return false; + if (getLevelIndex() + != other.getLevelIndex()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -337,16 +336,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + LEVEL_INDEX_FIELD_NUMBER; - hash = (53 * hash) + getLevelIndex(); if (getTowerBuffIdListCount() > 0) { hash = (37 * hash) + TOWER_BUFF_ID_LIST_FIELD_NUMBER; hash = (53 * hash) + getTowerBuffIdListList().hashCode(); } - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + FLOOR_ID_FIELD_NUMBER; hash = (53 * hash) + getFloorId(); + hash = (37 * hash) + LEVEL_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getLevelIndex(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -444,8 +443,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 26115
-     * Obf: KHHHPNPIIGJ
+     * CmdId: 21726
      *
* * Protobuf type {@code TowerEnterLevelRsp} @@ -485,14 +483,14 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - levelIndex_ = 0; - towerBuffIdList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000001); - retcode_ = 0; - floorId_ = 0; + levelIndex_ = 0; + + retcode_ = 0; + return this; } @@ -520,14 +518,14 @@ public emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp public emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp buildPartial() { emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp result = new emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp(this); int from_bitField0_ = bitField0_; - result.levelIndex_ = levelIndex_; if (((bitField0_ & 0x00000001) != 0)) { towerBuffIdList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.towerBuffIdList_ = towerBuffIdList_; - result.retcode_ = retcode_; result.floorId_ = floorId_; + result.levelIndex_ = levelIndex_; + result.retcode_ = retcode_; onBuilt(); return result; } @@ -576,9 +574,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp other) { if (other == emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp.getDefaultInstance()) return this; - if (other.getLevelIndex() != 0) { - setLevelIndex(other.getLevelIndex()); - } if (!other.towerBuffIdList_.isEmpty()) { if (towerBuffIdList_.isEmpty()) { towerBuffIdList_ = other.towerBuffIdList_; @@ -589,12 +584,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass. } onChanged(); } - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (other.getFloorId() != 0) { setFloorId(other.getFloorId()); } + if (other.getLevelIndex() != 0) { + setLevelIndex(other.getLevelIndex()); + } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -625,37 +623,6 @@ public Builder mergeFrom( } private int bitField0_; - private int levelIndex_ ; - /** - * uint32 level_index = 9; - * @return The levelIndex. - */ - @java.lang.Override - public int getLevelIndex() { - return levelIndex_; - } - /** - * uint32 level_index = 9; - * @param value The levelIndex to set. - * @return This builder for chaining. - */ - public Builder setLevelIndex(int value) { - - levelIndex_ = value; - onChanged(); - return this; - } - /** - * uint32 level_index = 9; - * @return This builder for chaining. - */ - public Builder clearLevelIndex() { - - levelIndex_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.Internal.IntList towerBuffIdList_ = emptyIntList(); private void ensureTowerBuffIdListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { @@ -664,7 +631,7 @@ private void ensureTowerBuffIdListIsMutable() { } } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @return A list containing the towerBuffIdList. */ public java.util.List @@ -673,14 +640,14 @@ private void ensureTowerBuffIdListIsMutable() { java.util.Collections.unmodifiableList(towerBuffIdList_) : towerBuffIdList_; } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @return The count of towerBuffIdList. */ public int getTowerBuffIdListCount() { return towerBuffIdList_.size(); } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @param index The index of the element to return. * @return The towerBuffIdList at the given index. */ @@ -688,7 +655,7 @@ public int getTowerBuffIdList(int index) { return towerBuffIdList_.getInt(index); } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @param index The index to set the value at. * @param value The towerBuffIdList to set. * @return This builder for chaining. @@ -701,7 +668,7 @@ public Builder setTowerBuffIdList( return this; } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @param value The towerBuffIdList to add. * @return This builder for chaining. */ @@ -712,7 +679,7 @@ public Builder addTowerBuffIdList(int value) { return this; } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @param values The towerBuffIdList to add. * @return This builder for chaining. */ @@ -725,7 +692,7 @@ public Builder addAllTowerBuffIdList( return this; } /** - * repeated uint32 tower_buff_id_list = 12; + * repeated uint32 tower_buff_id_list = 5; * @return This builder for chaining. */ public Builder clearTowerBuffIdList() { @@ -735,64 +702,95 @@ public Builder clearTowerBuffIdList() { return this; } - private int retcode_ ; + private int floorId_ ; /** - * int32 retcode = 4; - * @return The retcode. + * uint32 floor_id = 9; + * @return The floorId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getFloorId() { + return floorId_; } /** - * int32 retcode = 4; - * @param value The retcode to set. + * uint32 floor_id = 9; + * @param value The floorId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setFloorId(int value) { - retcode_ = value; + floorId_ = value; onChanged(); return this; } /** - * int32 retcode = 4; + * uint32 floor_id = 9; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearFloorId() { - retcode_ = 0; + floorId_ = 0; onChanged(); return this; } - private int floorId_ ; + private int levelIndex_ ; /** - * uint32 floor_id = 11; - * @return The floorId. + * uint32 level_index = 12; + * @return The levelIndex. */ @java.lang.Override - public int getFloorId() { - return floorId_; + public int getLevelIndex() { + return levelIndex_; } /** - * uint32 floor_id = 11; - * @param value The floorId to set. + * uint32 level_index = 12; + * @param value The levelIndex to set. * @return This builder for chaining. */ - public Builder setFloorId(int value) { + public Builder setLevelIndex(int value) { - floorId_ = value; + levelIndex_ = value; onChanged(); return this; } /** - * uint32 floor_id = 11; + * uint32 level_index = 12; * @return This builder for chaining. */ - public Builder clearFloorId() { + public Builder clearLevelIndex() { - floorId_ = 0; + levelIndex_ = 0; + onChanged(); + return this; + } + + private int retcode_ ; + /** + * int32 retcode = 14; + * @return The retcode. + */ + @java.lang.Override + public int getRetcode() { + return retcode_; + } + /** + * int32 retcode = 14; + * @param value The retcode to set. + * @return This builder for chaining. + */ + public Builder setRetcode(int value) { + + retcode_ = value; + onChanged(); + return this; + } + /** + * int32 retcode = 14; + * @return This builder for chaining. + */ + public Builder clearRetcode() { + + retcode_ = 0; onChanged(); return this; } @@ -864,9 +862,9 @@ public emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp static { java.lang.String[] descriptorData = { "\n\030TowerEnterLevelRsp.proto\"h\n\022TowerEnter" + - "LevelRsp\022\023\n\013level_index\030\t \001(\r\022\032\n\022tower_b" + - "uff_id_list\030\014 \003(\r\022\017\n\007retcode\030\004 \001(\005\022\020\n\010fl" + - "oor_id\030\013 \001(\rB\033\n\031emu.grasscutter.net.prot" + + "LevelRsp\022\032\n\022tower_buff_id_list\030\005 \003(\r\022\020\n\010" + + "floor_id\030\t \001(\r\022\023\n\013level_index\030\014 \001(\r\022\017\n\007r" + + "etcode\030\016 \001(\005B\033\n\031emu.grasscutter.net.prot" + "ob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -878,7 +876,7 @@ public emu.grasscutter.net.proto.TowerEnterLevelRspOuterClass.TowerEnterLevelRsp internal_static_TowerEnterLevelRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerEnterLevelRsp_descriptor, - new java.lang.String[] { "LevelIndex", "TowerBuffIdList", "Retcode", "FloorId", }); + new java.lang.String[] { "TowerBuffIdList", "FloorId", "LevelIndex", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerFightRecordPairOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerFightRecordPairOuterClass.java index c32d913b3a6..0d6284519a7 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerFightRecordPairOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerFightRecordPairOuterClass.java @@ -18,23 +18,19 @@ public interface TowerFightRecordPairOrBuilder extends // @@protoc_insertion_point(interface_extends:TowerFightRecordPair) com.google.protobuf.MessageOrBuilder { - /** - * uint32 avatar_id = 2; - * @return The avatarId. - */ - int getAvatarId(); - /** * uint32 data = 3; * @return The data. */ int getData(); + + /** + * uint32 avatar_id = 11; + * @return The avatarId. + */ + int getAvatarId(); } /** - * 
-   * Obf: OHPEOGBNHOD
-   *
- * * Protobuf type {@code TowerFightRecordPair} */ public static final class TowerFightRecordPair extends @@ -79,14 +75,14 @@ private TowerFightRecordPair( case 0: done = true; break; - case 16: { + case 24: { - avatarId_ = input.readUInt32(); + data_ = input.readUInt32(); break; } - case 24: { + case 88: { - data_ = input.readUInt32(); + avatarId_ = input.readUInt32(); break; } default: { @@ -121,17 +117,6 @@ private TowerFightRecordPair( emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.class, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder.class); } - public static final int AVATAR_ID_FIELD_NUMBER = 2; - private int avatarId_; - /** - * uint32 avatar_id = 2; - * @return The avatarId. - */ - @java.lang.Override - public int getAvatarId() { - return avatarId_; - } - public static final int DATA_FIELD_NUMBER = 3; private int data_; /** @@ -143,6 +128,17 @@ public int getData() { return data_; } + public static final int AVATAR_ID_FIELD_NUMBER = 11; + private int avatarId_; + /** + * uint32 avatar_id = 11; + * @return The avatarId. + */ + @java.lang.Override + public int getAvatarId() { + return avatarId_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -157,12 +153,12 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (avatarId_ != 0) { - output.writeUInt32(2, avatarId_); - } if (data_ != 0) { output.writeUInt32(3, data_); } + if (avatarId_ != 0) { + output.writeUInt32(11, avatarId_); + } unknownFields.writeTo(output); } @@ -172,14 +168,14 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (avatarId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, avatarId_); - } if (data_ != 0) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(3, data_); } + if (avatarId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(11, avatarId_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -195,10 +191,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair other = (emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair) obj; - if (getAvatarId() - != other.getAvatarId()) return false; if (getData() != other.getData()) return false; + if (getAvatarId() + != other.getAvatarId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -210,10 +206,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; - hash = (53 * hash) + getAvatarId(); hash = (37 * hash) + DATA_FIELD_NUMBER; hash = (53 * hash) + getData(); + hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER; + hash = (53 * hash) + getAvatarId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -310,10 +306,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: OHPEOGBNHOD
-     *
- * * Protobuf type {@code TowerFightRecordPair} */ public static final class Builder extends @@ -351,10 +343,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - avatarId_ = 0; - data_ = 0; + avatarId_ = 0; + return this; } @@ -381,8 +373,8 @@ public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecord @java.lang.Override public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair buildPartial() { emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair result = new emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair(this); - result.avatarId_ = avatarId_; result.data_ = data_; + result.avatarId_ = avatarId_; onBuilt(); return result; } @@ -431,12 +423,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair other) { if (other == emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance()) return this; - if (other.getAvatarId() != 0) { - setAvatarId(other.getAvatarId()); - } if (other.getData() != 0) { setData(other.getData()); } + if (other.getAvatarId() != 0) { + setAvatarId(other.getAvatarId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -466,64 +458,64 @@ public Builder mergeFrom( return this; } - private int avatarId_ ; + private int data_ ; /** - * uint32 avatar_id = 2; - * @return The avatarId. + * uint32 data = 3; + * @return The data. */ @java.lang.Override - public int getAvatarId() { - return avatarId_; + public int getData() { + return data_; } /** - * uint32 avatar_id = 2; - * @param value The avatarId to set. + * uint32 data = 3; + * @param value The data to set. * @return This builder for chaining. */ - public Builder setAvatarId(int value) { + public Builder setData(int value) { - avatarId_ = value; + data_ = value; onChanged(); return this; } /** - * uint32 avatar_id = 2; + * uint32 data = 3; * @return This builder for chaining. */ - public Builder clearAvatarId() { + public Builder clearData() { - avatarId_ = 0; + data_ = 0; onChanged(); return this; } - private int data_ ; + private int avatarId_ ; /** - * uint32 data = 3; - * @return The data. + * uint32 avatar_id = 11; + * @return The avatarId. */ @java.lang.Override - public int getData() { - return data_; + public int getAvatarId() { + return avatarId_; } /** - * uint32 data = 3; - * @param value The data to set. + * uint32 avatar_id = 11; + * @param value The avatarId to set. * @return This builder for chaining. */ - public Builder setData(int value) { + public Builder setAvatarId(int value) { - data_ = value; + avatarId_ = value; onChanged(); return this; } /** - * uint32 data = 3; + * uint32 avatar_id = 11; * @return This builder for chaining. */ - public Builder clearData() { + public Builder clearAvatarId() { - data_ = 0; + avatarId_ = 0; onChanged(); return this; } @@ -595,8 +587,8 @@ public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecord static { java.lang.String[] descriptorData = { "\n\032TowerFightRecordPair.proto\"7\n\024TowerFig" + - "htRecordPair\022\021\n\tavatar_id\030\002 \001(\r\022\014\n\004data\030" + - "\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + + "htRecordPair\022\014\n\004data\030\003 \001(\r\022\021\n\tavatar_id\030" + + "\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -608,7 +600,7 @@ public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecord internal_static_TowerFightRecordPair_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerFightRecordPair_descriptor, - new java.lang.String[] { "AvatarId", "Data", }); + new java.lang.String[] { "Data", "AvatarId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerFloorRecordChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerFloorRecordChangeNotifyOuterClass.java index 992db728430..abb9d7787be 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerFloorRecordChangeNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerFloorRecordChangeNotifyOuterClass.java @@ -19,39 +19,38 @@ public interface TowerFloorRecordChangeNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ java.util.List getTowerFloorRecordListList(); /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index); /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ int getTowerFloorRecordListCount(); /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ java.util.List getTowerFloorRecordListOrBuilderList(); /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( int index); /** - * bool is_finished_entrance_floor = 1; + * bool is_finished_entrance_floor = 13; * @return The isFinishedEntranceFloor. */ boolean getIsFinishedEntranceFloor(); } /** * 
-   * CmdId: 23989
-   * Obf: EEHMCGKNNPI
+   * CmdId: 25333
    *
* * Protobuf type {@code TowerFloorRecordChangeNotify} @@ -100,12 +99,7 @@ private TowerFloorRecordChangeNotify( case 0: done = true; break; - case 8: { - - isFinishedEntranceFloor_ = input.readBool(); - break; - } - case 74: { + case 98: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { towerFloorRecordList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -114,6 +108,11 @@ private TowerFloorRecordChangeNotify( input.readMessage(emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.parser(), extensionRegistry)); break; } + case 104: { + + isFinishedEntranceFloor_ = input.readBool(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -149,17 +148,17 @@ private TowerFloorRecordChangeNotify( emu.grasscutter.net.proto.TowerFloorRecordChangeNotifyOuterClass.TowerFloorRecordChangeNotify.class, emu.grasscutter.net.proto.TowerFloorRecordChangeNotifyOuterClass.TowerFloorRecordChangeNotify.Builder.class); } - public static final int TOWER_FLOOR_RECORD_LIST_FIELD_NUMBER = 9; + public static final int TOWER_FLOOR_RECORD_LIST_FIELD_NUMBER = 12; private java.util.List towerFloorRecordList_; /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ @java.lang.Override public java.util.List getTowerFloorRecordListList() { return towerFloorRecordList_; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ @java.lang.Override public java.util.List @@ -167,21 +166,21 @@ public java.util.Listrepeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ @java.lang.Override public int getTowerFloorRecordListCount() { return towerFloorRecordList_.size(); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ @java.lang.Override public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index) { return towerFloorRecordList_.get(index); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ @java.lang.Override public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( @@ -189,10 +188,10 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBu return towerFloorRecordList_.get(index); } - public static final int IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER = 1; + public static final int IS_FINISHED_ENTRANCE_FLOOR_FIELD_NUMBER = 13; private boolean isFinishedEntranceFloor_; /** - * bool is_finished_entrance_floor = 1; + * bool is_finished_entrance_floor = 13; * @return The isFinishedEntranceFloor. */ @java.lang.Override @@ -214,11 +213,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (isFinishedEntranceFloor_ != false) { - output.writeBool(1, isFinishedEntranceFloor_); - } for (int i = 0; i < towerFloorRecordList_.size(); i++) { - output.writeMessage(9, towerFloorRecordList_.get(i)); + output.writeMessage(12, towerFloorRecordList_.get(i)); + } + if (isFinishedEntranceFloor_ != false) { + output.writeBool(13, isFinishedEntranceFloor_); } unknownFields.writeTo(output); } @@ -229,13 +228,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (isFinishedEntranceFloor_ != false) { + for (int i = 0; i < towerFloorRecordList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, isFinishedEntranceFloor_); + .computeMessageSize(12, towerFloorRecordList_.get(i)); } - for (int i = 0; i < towerFloorRecordList_.size(); i++) { + if (isFinishedEntranceFloor_ != false) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, towerFloorRecordList_.get(i)); + .computeBoolSize(13, isFinishedEntranceFloor_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -371,8 +370,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 23989
-     * Obf: EEHMCGKNNPI
+     * CmdId: 25333
      *
* * Protobuf type {@code TowerFloorRecordChangeNotify} @@ -578,7 +576,7 @@ private void ensureTowerFloorRecordListIsMutable() { emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder> towerFloorRecordListBuilder_; /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public java.util.List getTowerFloorRecordListList() { if (towerFloorRecordListBuilder_ == null) { @@ -588,7 +586,7 @@ public java.util.Listrepeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public int getTowerFloorRecordListCount() { if (towerFloorRecordListBuilder_ == null) { @@ -598,7 +596,7 @@ public int getTowerFloorRecordListCount() { } } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord getTowerFloorRecordList(int index) { if (towerFloorRecordListBuilder_ == null) { @@ -608,7 +606,7 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord get } } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder setTowerFloorRecordList( int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { @@ -625,7 +623,7 @@ public Builder setTowerFloorRecordList( return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder setTowerFloorRecordList( int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { @@ -639,7 +637,7 @@ public Builder setTowerFloorRecordList( return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder addTowerFloorRecordList(emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { if (towerFloorRecordListBuilder_ == null) { @@ -655,7 +653,7 @@ public Builder addTowerFloorRecordList(emu.grasscutter.net.proto.TowerFloorRecor return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder addTowerFloorRecordList( int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord value) { @@ -672,7 +670,7 @@ public Builder addTowerFloorRecordList( return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder addTowerFloorRecordList( emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { @@ -686,7 +684,7 @@ public Builder addTowerFloorRecordList( return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder addTowerFloorRecordList( int index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder builderForValue) { @@ -700,7 +698,7 @@ public Builder addTowerFloorRecordList( return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder addAllTowerFloorRecordList( java.lang.Iterable values) { @@ -715,7 +713,7 @@ public Builder addAllTowerFloorRecordList( return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder clearTowerFloorRecordList() { if (towerFloorRecordListBuilder_ == null) { @@ -728,7 +726,7 @@ public Builder clearTowerFloorRecordList() { return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public Builder removeTowerFloorRecordList(int index) { if (towerFloorRecordListBuilder_ == null) { @@ -741,14 +739,14 @@ public Builder removeTowerFloorRecordList(int index) { return this; } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder getTowerFloorRecordListBuilder( int index) { return getTowerFloorRecordListFieldBuilder().getBuilder(index); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBuilder getTowerFloorRecordListOrBuilder( int index) { @@ -758,7 +756,7 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBu } } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public java.util.List getTowerFloorRecordListOrBuilderList() { @@ -769,14 +767,14 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecordOrBu } } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder addTowerFloorRecordListBuilder() { return getTowerFloorRecordListFieldBuilder().addBuilder( emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.getDefaultInstance()); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder addTowerFloorRecordListBuilder( int index) { @@ -784,7 +782,7 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Bui index, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.getDefaultInstance()); } /** - * repeated .TowerFloorRecord tower_floor_record_list = 9; + * repeated .TowerFloorRecord tower_floor_record_list = 12; */ public java.util.List getTowerFloorRecordListBuilderList() { @@ -807,7 +805,7 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Bui private boolean isFinishedEntranceFloor_ ; /** - * bool is_finished_entrance_floor = 1; + * bool is_finished_entrance_floor = 13; * @return The isFinishedEntranceFloor. */ @java.lang.Override @@ -815,7 +813,7 @@ public boolean getIsFinishedEntranceFloor() { return isFinishedEntranceFloor_; } /** - * bool is_finished_entrance_floor = 1; + * bool is_finished_entrance_floor = 13; * @param value The isFinishedEntranceFloor to set. * @return This builder for chaining. */ @@ -826,7 +824,7 @@ public Builder setIsFinishedEntranceFloor(boolean value) { return this; } /** - * bool is_finished_entrance_floor = 1; + * bool is_finished_entrance_floor = 13; * @return This builder for chaining. */ public Builder clearIsFinishedEntranceFloor() { @@ -905,8 +903,8 @@ public emu.grasscutter.net.proto.TowerFloorRecordChangeNotifyOuterClass.TowerFlo "\n\"TowerFloorRecordChangeNotify.proto\032\026To" + "werFloorRecord.proto\"v\n\034TowerFloorRecord" + "ChangeNotify\0222\n\027tower_floor_record_list\030" + - "\t \003(\0132\021.TowerFloorRecord\022\"\n\032is_finished_" + - "entrance_floor\030\001 \001(\010B\033\n\031emu.grasscutter." + + "\014 \003(\0132\021.TowerFloorRecord\022\"\n\032is_finished_" + + "entrance_floor\030\r \001(\010B\033\n\031emu.grasscutter." + "net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerFloorRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerFloorRecordOuterClass.java index bf52d86ab4c..373708b4b60 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerFloorRecordOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerFloorRecordOuterClass.java @@ -19,17 +19,47 @@ public interface TowerFloorRecordOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 floor_id = 11; + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + java.util.List + getPassedLevelRecordListList(); + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord getPassedLevelRecordList(int index); + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + int getPassedLevelRecordListCount(); + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + java.util.List + getPassedLevelRecordListOrBuilderList(); + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBuilder getPassedLevelRecordListOrBuilder( + int index); + + /** + * uint32 floor_id = 2; * @return The floorId. */ int getFloorId(); /** - * map<uint32, uint32> passed_level_map = 2; + * uint32 floor_star_reward_progress = 5; + * @return The floorStarRewardProgress. + */ + int getFloorStarRewardProgress(); + + /** + * map<uint32, uint32> passed_level_map = 6; */ int getPassedLevelMapCount(); /** - * map<uint32, uint32> passed_level_map = 2; + * map<uint32, uint32> passed_level_map = 6; */ boolean containsPassedLevelMap( int key); @@ -40,59 +70,25 @@ boolean containsPassedLevelMap( java.util.Map getPassedLevelMap(); /** - * map<uint32, uint32> passed_level_map = 2; + * map<uint32, uint32> passed_level_map = 6; */ java.util.Map getPassedLevelMapMap(); /** - * map<uint32, uint32> passed_level_map = 2; + * map<uint32, uint32> passed_level_map = 6; */ int getPassedLevelMapOrDefault( int key, int defaultValue); /** - * map<uint32, uint32> passed_level_map = 2; + * map<uint32, uint32> passed_level_map = 6; */ int getPassedLevelMapOrThrow( int key); - - /** - * uint32 floor_star_reward_progress = 7; - * @return The floorStarRewardProgress. - */ - int getFloorStarRewardProgress(); - - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - java.util.List - getPassedLevelRecordListList(); - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord getPassedLevelRecordList(int index); - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - int getPassedLevelRecordListCount(); - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - java.util.List - getPassedLevelRecordListOrBuilderList(); - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBuilder getPassedLevelRecordListOrBuilder( - int index); } /** - * 
-   * Obf: BGHANHOBDGP
-   *
- * * Protobuf type {@code TowerFloorRecord} */ public static final class TowerFloorRecord extends @@ -139,36 +135,36 @@ private TowerFloorRecord( case 0: done = true; break; - case 18: { + case 10: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - passedLevelMap_ = com.google.protobuf.MapField.newMapField( - PassedLevelMapDefaultEntryHolder.defaultEntry); + passedLevelRecordList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - com.google.protobuf.MapEntry - passedLevelMap__ = input.readMessage( - PassedLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); - passedLevelMap_.getMutableMap().put( - passedLevelMap__.getKey(), passedLevelMap__.getValue()); + passedLevelRecordList_.add( + input.readMessage(emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.parser(), extensionRegistry)); + break; + } + case 16: { + + floorId_ = input.readUInt32(); break; } - case 56: { + case 40: { floorStarRewardProgress_ = input.readUInt32(); break; } - case 66: { + case 50: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - passedLevelRecordList_ = new java.util.ArrayList(); + passedLevelMap_ = com.google.protobuf.MapField.newMapField( + PassedLevelMapDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000002; } - passedLevelRecordList_.add( - input.readMessage(emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.parser(), extensionRegistry)); - break; - } - case 88: { - - floorId_ = input.readUInt32(); + com.google.protobuf.MapEntry + passedLevelMap__ = input.readMessage( + PassedLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry); + passedLevelMap_.getMutableMap().put( + passedLevelMap__.getKey(), passedLevelMap__.getValue()); break; } default: { @@ -186,7 +182,7 @@ private TowerFloorRecord( throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) != 0)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { passedLevelRecordList_ = java.util.Collections.unmodifiableList(passedLevelRecordList_); } this.unknownFields = unknownFields.build(); @@ -203,7 +199,7 @@ private TowerFloorRecord( protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 2: + case 6: return internalGetPassedLevelMap(); default: throw new RuntimeException( @@ -218,10 +214,50 @@ protected com.google.protobuf.MapField internalGetMapField( emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.class, emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.Builder.class); } - public static final int FLOOR_ID_FIELD_NUMBER = 11; + public static final int PASSED_LEVEL_RECORD_LIST_FIELD_NUMBER = 1; + private java.util.List passedLevelRecordList_; + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + @java.lang.Override + public java.util.List getPassedLevelRecordListList() { + return passedLevelRecordList_; + } + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + @java.lang.Override + public java.util.List + getPassedLevelRecordListOrBuilderList() { + return passedLevelRecordList_; + } + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + @java.lang.Override + public int getPassedLevelRecordListCount() { + return passedLevelRecordList_.size(); + } + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + @java.lang.Override + public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord getPassedLevelRecordList(int index) { + return passedLevelRecordList_.get(index); + } + /** + * repeated .TowerLevelRecord passed_level_record_list = 1; + */ + @java.lang.Override + public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBuilder getPassedLevelRecordListOrBuilder( + int index) { + return passedLevelRecordList_.get(index); + } + + public static final int FLOOR_ID_FIELD_NUMBER = 2; private int floorId_; /** - * uint32 floor_id = 11; + * uint32 floor_id = 2; * @return The floorId. */ @java.lang.Override @@ -229,7 +265,18 @@ public int getFloorId() { return floorId_; } - public static final int PASSED_LEVEL_MAP_FIELD_NUMBER = 2; + public static final int FLOOR_STAR_REWARD_PROGRESS_FIELD_NUMBER = 5; + private int floorStarRewardProgress_; + /** + * uint32 floor_star_reward_progress = 5; + * @return The floorStarRewardProgress. + */ + @java.lang.Override + public int getFloorStarRewardProgress() { + return floorStarRewardProgress_; + } + + public static final int PASSED_LEVEL_MAP_FIELD_NUMBER = 6; private static final class PassedLevelMapDefaultEntryHolder { static final com.google.protobuf.MapEntry< java.lang.Integer, java.lang.Integer> defaultEntry = @@ -256,7 +303,7 @@ public int getPassedLevelMapCount() { return internalGetPassedLevelMap().getMap().size(); } /** - * map<uint32, uint32> passed_level_map = 2; + * map<uint32, uint32> passed_level_map = 6; */ @java.lang.Override @@ -274,7 +321,7 @@ public java.util.Map getPassedLevelMap() { return getPassedLevelMapMap(); } /** - * map<uint32, uint32> passed_level_map = 2; + * map<uint32, uint32> passed_level_map = 6; */ @java.lang.Override @@ -282,7 +329,7 @@ public java.util.Map getPassedLevelMapMap( return internalGetPassedLevelMap().getMap(); } /** - * map<uint32, uint32> passed_level_map = 2; + * map<uint32, uint32> passed_level_map = 6; */ @java.lang.Override @@ -295,7 +342,7 @@ public int getPassedLevelMapOrDefault( return map.containsKey(key) ? map.get(key) : defaultValue; } /** - * map<uint32, uint32> passed_level_map = 2; + * map<uint32, uint32> passed_level_map = 6; */ @java.lang.Override @@ -310,57 +357,6 @@ public int getPassedLevelMapOrThrow( return map.get(key); } - public static final int FLOOR_STAR_REWARD_PROGRESS_FIELD_NUMBER = 7; - private int floorStarRewardProgress_; - /** - * uint32 floor_star_reward_progress = 7; - * @return The floorStarRewardProgress. - */ - @java.lang.Override - public int getFloorStarRewardProgress() { - return floorStarRewardProgress_; - } - - public static final int PASSED_LEVEL_RECORD_LIST_FIELD_NUMBER = 8; - private java.util.List passedLevelRecordList_; - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - @java.lang.Override - public java.util.List getPassedLevelRecordListList() { - return passedLevelRecordList_; - } - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - @java.lang.Override - public java.util.List - getPassedLevelRecordListOrBuilderList() { - return passedLevelRecordList_; - } - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - @java.lang.Override - public int getPassedLevelRecordListCount() { - return passedLevelRecordList_.size(); - } - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - @java.lang.Override - public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord getPassedLevelRecordList(int index) { - return passedLevelRecordList_.get(index); - } - /** - * repeated .TowerLevelRecord passed_level_record_list = 8; - */ - @java.lang.Override - public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBuilder getPassedLevelRecordListOrBuilder( - int index) { - return passedLevelRecordList_.get(index); - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -375,21 +371,21 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + for (int i = 0; i < passedLevelRecordList_.size(); i++) { + output.writeMessage(1, passedLevelRecordList_.get(i)); + } + if (floorId_ != 0) { + output.writeUInt32(2, floorId_); + } + if (floorStarRewardProgress_ != 0) { + output.writeUInt32(5, floorStarRewardProgress_); + } com.google.protobuf.GeneratedMessageV3 .serializeIntegerMapTo( output, internalGetPassedLevelMap(), PassedLevelMapDefaultEntryHolder.defaultEntry, - 2); - if (floorStarRewardProgress_ != 0) { - output.writeUInt32(7, floorStarRewardProgress_); - } - for (int i = 0; i < passedLevelRecordList_.size(); i++) { - output.writeMessage(8, passedLevelRecordList_.get(i)); - } - if (floorId_ != 0) { - output.writeUInt32(11, floorId_); - } + 6); unknownFields.writeTo(output); } @@ -399,6 +395,18 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + for (int i = 0; i < passedLevelRecordList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, passedLevelRecordList_.get(i)); + } + if (floorId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(2, floorId_); + } + if (floorStarRewardProgress_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(5, floorStarRewardProgress_); + } for (java.util.Map.Entry entry : internalGetPassedLevelMap().getMap().entrySet()) { com.google.protobuf.MapEntry @@ -407,19 +415,7 @@ public int getSerializedSize() { .setValue(entry.getValue()) .build(); size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, passedLevelMap__); - } - if (floorStarRewardProgress_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(7, floorStarRewardProgress_); - } - for (int i = 0; i < passedLevelRecordList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, passedLevelRecordList_.get(i)); - } - if (floorId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, floorId_); + .computeMessageSize(6, passedLevelMap__); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -436,14 +432,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord other = (emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord) obj; + if (!getPassedLevelRecordListList() + .equals(other.getPassedLevelRecordListList())) return false; if (getFloorId() != other.getFloorId()) return false; - if (!internalGetPassedLevelMap().equals( - other.internalGetPassedLevelMap())) return false; if (getFloorStarRewardProgress() != other.getFloorStarRewardProgress()) return false; - if (!getPassedLevelRecordListList() - .equals(other.getPassedLevelRecordListList())) return false; + if (!internalGetPassedLevelMap().equals( + other.internalGetPassedLevelMap())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -455,18 +451,18 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + if (getPassedLevelRecordListCount() > 0) { + hash = (37 * hash) + PASSED_LEVEL_RECORD_LIST_FIELD_NUMBER; + hash = (53 * hash) + getPassedLevelRecordListList().hashCode(); + } hash = (37 * hash) + FLOOR_ID_FIELD_NUMBER; hash = (53 * hash) + getFloorId(); + hash = (37 * hash) + FLOOR_STAR_REWARD_PROGRESS_FIELD_NUMBER; + hash = (53 * hash) + getFloorStarRewardProgress(); if (!internalGetPassedLevelMap().getMap().isEmpty()) { hash = (37 * hash) + PASSED_LEVEL_MAP_FIELD_NUMBER; hash = (53 * hash) + internalGetPassedLevelMap().hashCode(); } - hash = (37 * hash) + FLOOR_STAR_REWARD_PROGRESS_FIELD_NUMBER; - hash = (53 * hash) + getFloorStarRewardProgress(); - if (getPassedLevelRecordListCount() > 0) { - hash = (37 * hash) + PASSED_LEVEL_RECORD_LIST_FIELD_NUMBER; - hash = (53 * hash) + getPassedLevelRecordListList().hashCode(); - } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -563,10 +559,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: BGHANHOBDGP
-     *
- * * Protobuf type {@code TowerFloorRecord} */ public static final class Builder extends @@ -582,7 +574,7 @@ public static final class Builder extends protected com.google.protobuf.MapField internalGetMapField( int number) { switch (number) { - case 2: + case 6: return internalGetPassedLevelMap(); default: throw new RuntimeException( @@ -593,7 +585,7 @@ protected com.google.protobuf.MapField internalGetMapField( protected com.google.protobuf.MapField internalGetMutableMapField( int number) { switch (number) { - case 2: + case 6: return internalGetMutablePassedLevelMap(); default: throw new RuntimeException( @@ -627,17 +619,17 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - floorId_ = 0; - - internalGetMutablePassedLevelMap().clear(); - floorStarRewardProgress_ = 0; - if (passedLevelRecordListBuilder_ == null) { passedLevelRecordList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { passedLevelRecordListBuilder_.clear(); } + floorId_ = 0; + + floorStarRewardProgress_ = 0; + + internalGetMutablePassedLevelMap().clear(); return this; } @@ -665,19 +657,19 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord bui public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord buildPartial() { emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord result = new emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord(this); int from_bitField0_ = bitField0_; - result.floorId_ = floorId_; - result.passedLevelMap_ = internalGetPassedLevelMap(); - result.passedLevelMap_.makeImmutable(); - result.floorStarRewardProgress_ = floorStarRewardProgress_; if (passedLevelRecordListBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { + if (((bitField0_ & 0x00000001) != 0)) { passedLevelRecordList_ = java.util.Collections.unmodifiableList(passedLevelRecordList_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } result.passedLevelRecordList_ = passedLevelRecordList_; } else { result.passedLevelRecordList_ = passedLevelRecordListBuilder_.build(); } + result.floorId_ = floorId_; + result.floorStarRewardProgress_ = floorStarRewardProgress_; + result.passedLevelMap_ = internalGetPassedLevelMap(); + result.passedLevelMap_.makeImmutable(); onBuilt(); return result; } @@ -726,19 +718,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord other) { if (other == emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord.getDefaultInstance()) return this; - if (other.getFloorId() != 0) { - setFloorId(other.getFloorId()); - } - internalGetMutablePassedLevelMap().mergeFrom( - other.internalGetPassedLevelMap()); - if (other.getFloorStarRewardProgress() != 0) { - setFloorStarRewardProgress(other.getFloorStarRewardProgress()); - } if (passedLevelRecordListBuilder_ == null) { if (!other.passedLevelRecordList_.isEmpty()) { if (passedLevelRecordList_.isEmpty()) { passedLevelRecordList_ = other.passedLevelRecordList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); } else { ensurePassedLevelRecordListIsMutable(); passedLevelRecordList_.addAll(other.passedLevelRecordList_); @@ -751,7 +735,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerFloorRecordOuterClass.To passedLevelRecordListBuilder_.dispose(); passedLevelRecordListBuilder_ = null; passedLevelRecordList_ = other.passedLevelRecordList_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); passedLevelRecordListBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getPassedLevelRecordListFieldBuilder() : null; @@ -760,6 +744,14 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerFloorRecordOuterClass.To } } } + if (other.getFloorId() != 0) { + setFloorId(other.getFloorId()); + } + if (other.getFloorStarRewardProgress() != 0) { + setFloorStarRewardProgress(other.getFloorStarRewardProgress()); + } + internalGetMutablePassedLevelMap().mergeFrom( + other.internalGetPassedLevelMap()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -790,202 +782,12 @@ public Builder mergeFrom( } private int bitField0_; - private int floorId_ ; - /** - * uint32 floor_id = 11; - * @return The floorId. - */ - @java.lang.Override - public int getFloorId() { - return floorId_; - } - /** - * uint32 floor_id = 11; - * @param value The floorId to set. - * @return This builder for chaining. - */ - public Builder setFloorId(int value) { - - floorId_ = value; - onChanged(); - return this; - } - /** - * uint32 floor_id = 11; - * @return This builder for chaining. - */ - public Builder clearFloorId() { - - floorId_ = 0; - onChanged(); - return this; - } - - private com.google.protobuf.MapField< - java.lang.Integer, java.lang.Integer> passedLevelMap_; - private com.google.protobuf.MapField - internalGetPassedLevelMap() { - if (passedLevelMap_ == null) { - return com.google.protobuf.MapField.emptyMapField( - PassedLevelMapDefaultEntryHolder.defaultEntry); - } - return passedLevelMap_; - } - private com.google.protobuf.MapField - internalGetMutablePassedLevelMap() { - onChanged();; - if (passedLevelMap_ == null) { - passedLevelMap_ = com.google.protobuf.MapField.newMapField( - PassedLevelMapDefaultEntryHolder.defaultEntry); - } - if (!passedLevelMap_.isMutable()) { - passedLevelMap_ = passedLevelMap_.copy(); - } - return passedLevelMap_; - } - - public int getPassedLevelMapCount() { - return internalGetPassedLevelMap().getMap().size(); - } - /** - * map<uint32, uint32> passed_level_map = 2; - */ - - @java.lang.Override - public boolean containsPassedLevelMap( - int key) { - - return internalGetPassedLevelMap().getMap().containsKey(key); - } - /** - * Use {@link #getPassedLevelMapMap()} instead. - */ - @java.lang.Override - @java.lang.Deprecated - public java.util.Map getPassedLevelMap() { - return getPassedLevelMapMap(); - } - /** - * map<uint32, uint32> passed_level_map = 2; - */ - @java.lang.Override - - public java.util.Map getPassedLevelMapMap() { - return internalGetPassedLevelMap().getMap(); - } - /** - * map<uint32, uint32> passed_level_map = 2; - */ - @java.lang.Override - - public int getPassedLevelMapOrDefault( - int key, - int defaultValue) { - - java.util.Map map = - internalGetPassedLevelMap().getMap(); - return map.containsKey(key) ? map.get(key) : defaultValue; - } - /** - * map<uint32, uint32> passed_level_map = 2; - */ - @java.lang.Override - - public int getPassedLevelMapOrThrow( - int key) { - - java.util.Map map = - internalGetPassedLevelMap().getMap(); - if (!map.containsKey(key)) { - throw new java.lang.IllegalArgumentException(); - } - return map.get(key); - } - - public Builder clearPassedLevelMap() { - internalGetMutablePassedLevelMap().getMutableMap() - .clear(); - return this; - } - /** - * map<uint32, uint32> passed_level_map = 2; - */ - - public Builder removePassedLevelMap( - int key) { - - internalGetMutablePassedLevelMap().getMutableMap() - .remove(key); - return this; - } - /** - * Use alternate mutation accessors instead. - */ - @java.lang.Deprecated - public java.util.Map - getMutablePassedLevelMap() { - return internalGetMutablePassedLevelMap().getMutableMap(); - } - /** - * map<uint32, uint32> passed_level_map = 2; - */ - public Builder putPassedLevelMap( - int key, - int value) { - - - internalGetMutablePassedLevelMap().getMutableMap() - .put(key, value); - return this; - } - /** - * map<uint32, uint32> passed_level_map = 2; - */ - - public Builder putAllPassedLevelMap( - java.util.Map values) { - internalGetMutablePassedLevelMap().getMutableMap() - .putAll(values); - return this; - } - - private int floorStarRewardProgress_ ; - /** - * uint32 floor_star_reward_progress = 7; - * @return The floorStarRewardProgress. - */ - @java.lang.Override - public int getFloorStarRewardProgress() { - return floorStarRewardProgress_; - } - /** - * uint32 floor_star_reward_progress = 7; - * @param value The floorStarRewardProgress to set. - * @return This builder for chaining. - */ - public Builder setFloorStarRewardProgress(int value) { - - floorStarRewardProgress_ = value; - onChanged(); - return this; - } - /** - * uint32 floor_star_reward_progress = 7; - * @return This builder for chaining. - */ - public Builder clearFloorStarRewardProgress() { - - floorStarRewardProgress_ = 0; - onChanged(); - return this; - } - private java.util.List passedLevelRecordList_ = java.util.Collections.emptyList(); private void ensurePassedLevelRecordListIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { + if (!((bitField0_ & 0x00000001) != 0)) { passedLevelRecordList_ = new java.util.ArrayList(passedLevelRecordList_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000001; } } @@ -993,7 +795,7 @@ private void ensurePassedLevelRecordListIsMutable() { emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBuilder> passedLevelRecordListBuilder_; /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public java.util.List getPassedLevelRecordListList() { if (passedLevelRecordListBuilder_ == null) { @@ -1003,7 +805,7 @@ public java.util.Listrepeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public int getPassedLevelRecordListCount() { if (passedLevelRecordListBuilder_ == null) { @@ -1013,7 +815,7 @@ public int getPassedLevelRecordListCount() { } } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord getPassedLevelRecordList(int index) { if (passedLevelRecordListBuilder_ == null) { @@ -1023,7 +825,7 @@ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord get } } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder setPassedLevelRecordList( int index, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord value) { @@ -1040,7 +842,7 @@ public Builder setPassedLevelRecordList( return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder setPassedLevelRecordList( int index, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder builderForValue) { @@ -1054,7 +856,7 @@ public Builder setPassedLevelRecordList( return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder addPassedLevelRecordList(emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord value) { if (passedLevelRecordListBuilder_ == null) { @@ -1070,7 +872,7 @@ public Builder addPassedLevelRecordList(emu.grasscutter.net.proto.TowerLevelReco return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder addPassedLevelRecordList( int index, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord value) { @@ -1087,7 +889,7 @@ public Builder addPassedLevelRecordList( return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder addPassedLevelRecordList( emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder builderForValue) { @@ -1101,7 +903,7 @@ public Builder addPassedLevelRecordList( return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder addPassedLevelRecordList( int index, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder builderForValue) { @@ -1115,7 +917,7 @@ public Builder addPassedLevelRecordList( return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder addAllPassedLevelRecordList( java.lang.Iterable values) { @@ -1130,12 +932,12 @@ public Builder addAllPassedLevelRecordList( return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder clearPassedLevelRecordList() { if (passedLevelRecordListBuilder_ == null) { passedLevelRecordList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { passedLevelRecordListBuilder_.clear(); @@ -1143,7 +945,7 @@ public Builder clearPassedLevelRecordList() { return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public Builder removePassedLevelRecordList(int index) { if (passedLevelRecordListBuilder_ == null) { @@ -1156,14 +958,14 @@ public Builder removePassedLevelRecordList(int index) { return this; } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder getPassedLevelRecordListBuilder( int index) { return getPassedLevelRecordListFieldBuilder().getBuilder(index); } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBuilder getPassedLevelRecordListOrBuilder( int index) { @@ -1173,7 +975,7 @@ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBu } } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public java.util.List getPassedLevelRecordListOrBuilderList() { @@ -1184,14 +986,14 @@ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBu } } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder addPassedLevelRecordListBuilder() { return getPassedLevelRecordListFieldBuilder().addBuilder( emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.getDefaultInstance()); } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder addPassedLevelRecordListBuilder( int index) { @@ -1199,7 +1001,7 @@ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Bui index, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.getDefaultInstance()); } /** - * repeated .TowerLevelRecord passed_level_record_list = 8; + * repeated .TowerLevelRecord passed_level_record_list = 1; */ public java.util.List getPassedLevelRecordListBuilderList() { @@ -1212,13 +1014,203 @@ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Bui passedLevelRecordListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecordOrBuilder>( passedLevelRecordList_, - ((bitField0_ & 0x00000002) != 0), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); passedLevelRecordList_ = null; } return passedLevelRecordListBuilder_; } + + private int floorId_ ; + /** + * uint32 floor_id = 2; + * @return The floorId. + */ + @java.lang.Override + public int getFloorId() { + return floorId_; + } + /** + * uint32 floor_id = 2; + * @param value The floorId to set. + * @return This builder for chaining. + */ + public Builder setFloorId(int value) { + + floorId_ = value; + onChanged(); + return this; + } + /** + * uint32 floor_id = 2; + * @return This builder for chaining. + */ + public Builder clearFloorId() { + + floorId_ = 0; + onChanged(); + return this; + } + + private int floorStarRewardProgress_ ; + /** + * uint32 floor_star_reward_progress = 5; + * @return The floorStarRewardProgress. + */ + @java.lang.Override + public int getFloorStarRewardProgress() { + return floorStarRewardProgress_; + } + /** + * uint32 floor_star_reward_progress = 5; + * @param value The floorStarRewardProgress to set. + * @return This builder for chaining. + */ + public Builder setFloorStarRewardProgress(int value) { + + floorStarRewardProgress_ = value; + onChanged(); + return this; + } + /** + * uint32 floor_star_reward_progress = 5; + * @return This builder for chaining. + */ + public Builder clearFloorStarRewardProgress() { + + floorStarRewardProgress_ = 0; + onChanged(); + return this; + } + + private com.google.protobuf.MapField< + java.lang.Integer, java.lang.Integer> passedLevelMap_; + private com.google.protobuf.MapField + internalGetPassedLevelMap() { + if (passedLevelMap_ == null) { + return com.google.protobuf.MapField.emptyMapField( + PassedLevelMapDefaultEntryHolder.defaultEntry); + } + return passedLevelMap_; + } + private com.google.protobuf.MapField + internalGetMutablePassedLevelMap() { + onChanged();; + if (passedLevelMap_ == null) { + passedLevelMap_ = com.google.protobuf.MapField.newMapField( + PassedLevelMapDefaultEntryHolder.defaultEntry); + } + if (!passedLevelMap_.isMutable()) { + passedLevelMap_ = passedLevelMap_.copy(); + } + return passedLevelMap_; + } + + public int getPassedLevelMapCount() { + return internalGetPassedLevelMap().getMap().size(); + } + /** + * map<uint32, uint32> passed_level_map = 6; + */ + + @java.lang.Override + public boolean containsPassedLevelMap( + int key) { + + return internalGetPassedLevelMap().getMap().containsKey(key); + } + /** + * Use {@link #getPassedLevelMapMap()} instead. + */ + @java.lang.Override + @java.lang.Deprecated + public java.util.Map getPassedLevelMap() { + return getPassedLevelMapMap(); + } + /** + * map<uint32, uint32> passed_level_map = 6; + */ + @java.lang.Override + + public java.util.Map getPassedLevelMapMap() { + return internalGetPassedLevelMap().getMap(); + } + /** + * map<uint32, uint32> passed_level_map = 6; + */ + @java.lang.Override + + public int getPassedLevelMapOrDefault( + int key, + int defaultValue) { + + java.util.Map map = + internalGetPassedLevelMap().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + * map<uint32, uint32> passed_level_map = 6; + */ + @java.lang.Override + + public int getPassedLevelMapOrThrow( + int key) { + + java.util.Map map = + internalGetPassedLevelMap().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearPassedLevelMap() { + internalGetMutablePassedLevelMap().getMutableMap() + .clear(); + return this; + } + /** + * map<uint32, uint32> passed_level_map = 6; + */ + + public Builder removePassedLevelMap( + int key) { + + internalGetMutablePassedLevelMap().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutablePassedLevelMap() { + return internalGetMutablePassedLevelMap().getMutableMap(); + } + /** + * map<uint32, uint32> passed_level_map = 6; + */ + public Builder putPassedLevelMap( + int key, + int value) { + + + internalGetMutablePassedLevelMap().getMutableMap() + .put(key, value); + return this; + } + /** + * map<uint32, uint32> passed_level_map = 6; + */ + + public Builder putAllPassedLevelMap( + java.util.Map values) { + internalGetMutablePassedLevelMap().getMutableMap() + .putAll(values); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -1292,12 +1284,12 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord get static { java.lang.String[] descriptorData = { "\n\026TowerFloorRecord.proto\032\026TowerLevelReco" + - "rd.proto\"\365\001\n\020TowerFloorRecord\022\020\n\010floor_i" + - "d\030\013 \001(\r\022?\n\020passed_level_map\030\002 \003(\0132%.Towe" + - "rFloorRecord.PassedLevelMapEntry\022\"\n\032floo" + - "r_star_reward_progress\030\007 \001(\r\0223\n\030passed_l" + - "evel_record_list\030\010 \003(\0132\021.TowerLevelRecor" + - "d\0325\n\023PassedLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n" + + "rd.proto\"\365\001\n\020TowerFloorRecord\0223\n\030passed_" + + "level_record_list\030\001 \003(\0132\021.TowerLevelReco" + + "rd\022\020\n\010floor_id\030\002 \001(\r\022\"\n\032floor_star_rewar" + + "d_progress\030\005 \001(\r\022?\n\020passed_level_map\030\006 \003" + + "(\0132%.TowerFloorRecord.PassedLevelMapEntr" + + "y\0325\n\023PassedLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n" + "\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net." + "protob\006proto3" }; @@ -1311,7 +1303,7 @@ public emu.grasscutter.net.proto.TowerFloorRecordOuterClass.TowerFloorRecord get internal_static_TowerFloorRecord_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerFloorRecord_descriptor, - new java.lang.String[] { "FloorId", "PassedLevelMap", "FloorStarRewardProgress", "PassedLevelRecordList", }); + new java.lang.String[] { "PassedLevelRecordList", "FloorId", "FloorStarRewardProgress", "PassedLevelMap", }); internal_static_TowerFloorRecord_PassedLevelMapEntry_descriptor = internal_static_TowerFloorRecord_descriptor.getNestedTypes().get(0); internal_static_TowerFloorRecord_PassedLevelMapEntry_fieldAccessorTable = new diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerGetFloorStarRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerGetFloorStarRewardReqOuterClass.java index 0ea0625eb15..7474b9d189c 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerGetFloorStarRewardReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerGetFloorStarRewardReqOuterClass.java @@ -19,15 +19,14 @@ public interface TowerGetFloorStarRewardReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 floor_id = 3; + * uint32 floor_id = 13; * @return The floorId. */ int getFloorId(); } /** * 
-   * CmdId: 5764
-   * Obf: ELMPNCMADBL
+   * CmdId: 5963
    *
* * Protobuf type {@code TowerGetFloorStarRewardReq} @@ -74,7 +73,7 @@ private TowerGetFloorStarRewardReq( case 0: done = true; break; - case 24: { + case 104: { floorId_ = input.readUInt32(); break; @@ -111,10 +110,10 @@ private TowerGetFloorStarRewardReq( emu.grasscutter.net.proto.TowerGetFloorStarRewardReqOuterClass.TowerGetFloorStarRewardReq.class, emu.grasscutter.net.proto.TowerGetFloorStarRewardReqOuterClass.TowerGetFloorStarRewardReq.Builder.class); } - public static final int FLOOR_ID_FIELD_NUMBER = 3; + public static final int FLOOR_ID_FIELD_NUMBER = 13; private int floorId_; /** - * uint32 floor_id = 3; + * uint32 floor_id = 13; * @return The floorId. */ @java.lang.Override @@ -137,7 +136,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (floorId_ != 0) { - output.writeUInt32(3, floorId_); + output.writeUInt32(13, floorId_); } unknownFields.writeTo(output); } @@ -150,7 +149,7 @@ public int getSerializedSize() { size = 0; if (floorId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, floorId_); + .computeUInt32Size(13, floorId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +278,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5764
-     * Obf: ELMPNCMADBL
+     * CmdId: 5963
      *
* * Protobuf type {@code TowerGetFloorStarRewardReq} @@ -431,7 +429,7 @@ public Builder mergeFrom( private int floorId_ ; /** - * uint32 floor_id = 3; + * uint32 floor_id = 13; * @return The floorId. */ @java.lang.Override @@ -439,7 +437,7 @@ public int getFloorId() { return floorId_; } /** - * uint32 floor_id = 3; + * uint32 floor_id = 13; * @param value The floorId to set. * @return This builder for chaining. */ @@ -450,7 +448,7 @@ public Builder setFloorId(int value) { return this; } /** - * uint32 floor_id = 3; + * uint32 floor_id = 13; * @return This builder for chaining. */ public Builder clearFloorId() { @@ -527,7 +525,7 @@ public emu.grasscutter.net.proto.TowerGetFloorStarRewardReqOuterClass.TowerGetFl static { java.lang.String[] descriptorData = { "\n TowerGetFloorStarRewardReq.proto\".\n\032To" + - "werGetFloorStarRewardReq\022\020\n\010floor_id\030\003 \001" + + "werGetFloorStarRewardReq\022\020\n\010floor_id\030\r \001" + "(\rB\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerGetFloorStarRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerGetFloorStarRewardRspOuterClass.java index fea3e64a4c7..6784ce0f3e1 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerGetFloorStarRewardRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerGetFloorStarRewardRspOuterClass.java @@ -19,21 +19,20 @@ public interface TowerGetFloorStarRewardRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 5; - * @return The retcode. + * uint32 floor_id = 3; + * @return The floorId. */ - int getRetcode(); + int getFloorId(); /** - * uint32 floor_id = 10; - * @return The floorId. + * int32 retcode = 11; + * @return The retcode. */ - int getFloorId(); + int getRetcode(); } /** * 
-   * CmdId: 24127
-   * Obf: DIOLAHMFJLA
+   * CmdId: 21871
    *
* * Protobuf type {@code TowerGetFloorStarRewardRsp} @@ -80,14 +79,14 @@ private TowerGetFloorStarRewardRsp( case 0: done = true; break; - case 40: { + case 24: { - retcode_ = input.readInt32(); + floorId_ = input.readUInt32(); break; } - case 80: { + case 88: { - floorId_ = input.readUInt32(); + retcode_ = input.readInt32(); break; } default: { @@ -122,26 +121,26 @@ private TowerGetFloorStarRewardRsp( emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp.class, emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 5; - private int retcode_; + public static final int FLOOR_ID_FIELD_NUMBER = 3; + private int floorId_; /** - * int32 retcode = 5; - * @return The retcode. + * uint32 floor_id = 3; + * @return The floorId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getFloorId() { + return floorId_; } - public static final int FLOOR_ID_FIELD_NUMBER = 10; - private int floorId_; + public static final int RETCODE_FIELD_NUMBER = 11; + private int retcode_; /** - * uint32 floor_id = 10; - * @return The floorId. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getFloorId() { - return floorId_; + public int getRetcode() { + return retcode_; } private byte memoizedIsInitialized = -1; @@ -158,11 +157,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (retcode_ != 0) { - output.writeInt32(5, retcode_); - } if (floorId_ != 0) { - output.writeUInt32(10, floorId_); + output.writeUInt32(3, floorId_); + } + if (retcode_ != 0) { + output.writeInt32(11, retcode_); } unknownFields.writeTo(output); } @@ -173,13 +172,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (retcode_ != 0) { + if (floorId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, retcode_); + .computeUInt32Size(3, floorId_); } - if (floorId_ != 0) { + if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(10, floorId_); + .computeInt32Size(11, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -196,10 +195,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp other = (emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp) obj; - if (getRetcode() - != other.getRetcode()) return false; if (getFloorId() != other.getFloorId()) return false; + if (getRetcode() + != other.getRetcode()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -211,10 +210,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + RETCODE_FIELD_NUMBER; - hash = (53 * hash) + getRetcode(); hash = (37 * hash) + FLOOR_ID_FIELD_NUMBER; hash = (53 * hash) + getFloorId(); + hash = (37 * hash) + RETCODE_FIELD_NUMBER; + hash = (53 * hash) + getRetcode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -312,8 +311,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 24127
-     * Obf: DIOLAHMFJLA
+     * CmdId: 21871
      *
* * Protobuf type {@code TowerGetFloorStarRewardRsp} @@ -353,10 +351,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - retcode_ = 0; - floorId_ = 0; + retcode_ = 0; + return this; } @@ -383,8 +381,8 @@ public emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFl @java.lang.Override public emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp buildPartial() { emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp result = new emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp(this); - result.retcode_ = retcode_; result.floorId_ = floorId_; + result.retcode_ = retcode_; onBuilt(); return result; } @@ -433,12 +431,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp other) { if (other == emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFloorStarRewardRsp.getDefaultInstance()) return this; - if (other.getRetcode() != 0) { - setRetcode(other.getRetcode()); - } if (other.getFloorId() != 0) { setFloorId(other.getFloorId()); } + if (other.getRetcode() != 0) { + setRetcode(other.getRetcode()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -468,64 +466,64 @@ public Builder mergeFrom( return this; } - private int retcode_ ; + private int floorId_ ; /** - * int32 retcode = 5; - * @return The retcode. + * uint32 floor_id = 3; + * @return The floorId. */ @java.lang.Override - public int getRetcode() { - return retcode_; + public int getFloorId() { + return floorId_; } /** - * int32 retcode = 5; - * @param value The retcode to set. + * uint32 floor_id = 3; + * @param value The floorId to set. * @return This builder for chaining. */ - public Builder setRetcode(int value) { + public Builder setFloorId(int value) { - retcode_ = value; + floorId_ = value; onChanged(); return this; } /** - * int32 retcode = 5; + * uint32 floor_id = 3; * @return This builder for chaining. */ - public Builder clearRetcode() { + public Builder clearFloorId() { - retcode_ = 0; + floorId_ = 0; onChanged(); return this; } - private int floorId_ ; + private int retcode_ ; /** - * uint32 floor_id = 10; - * @return The floorId. + * int32 retcode = 11; + * @return The retcode. */ @java.lang.Override - public int getFloorId() { - return floorId_; + public int getRetcode() { + return retcode_; } /** - * uint32 floor_id = 10; - * @param value The floorId to set. + * int32 retcode = 11; + * @param value The retcode to set. * @return This builder for chaining. */ - public Builder setFloorId(int value) { + public Builder setRetcode(int value) { - floorId_ = value; + retcode_ = value; onChanged(); return this; } /** - * uint32 floor_id = 10; + * int32 retcode = 11; * @return This builder for chaining. */ - public Builder clearFloorId() { + public Builder clearRetcode() { - floorId_ = 0; + retcode_ = 0; onChanged(); return this; } @@ -597,8 +595,8 @@ public emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFl static { java.lang.String[] descriptorData = { "\n TowerGetFloorStarRewardRsp.proto\"?\n\032To" + - "werGetFloorStarRewardRsp\022\017\n\007retcode\030\005 \001(" + - "\005\022\020\n\010floor_id\030\n \001(\rB\033\n\031emu.grasscutter.n" + + "werGetFloorStarRewardRsp\022\020\n\010floor_id\030\003 \001" + + "(\r\022\017\n\007retcode\030\013 \001(\005B\033\n\031emu.grasscutter.n" + "et.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -610,7 +608,7 @@ public emu.grasscutter.net.proto.TowerGetFloorStarRewardRspOuterClass.TowerGetFl internal_static_TowerGetFloorStarRewardRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerGetFloorStarRewardRsp_descriptor, - new java.lang.String[] { "Retcode", "FloorId", }); + new java.lang.String[] { "FloorId", "Retcode", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java index ca11b739936..5544d5c6395 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java @@ -47,10 +47,10 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemLi *sus 11 * * - * uint32 next_floor_id = 3; - * @return The nextFloorId. + * uint32 continue_state = 3; + * @return The continueState. */ - int getNextFloorId(); + int getContinueState(); /** * repeated uint32 finished_star_cond_list = 8; @@ -74,10 +74,10 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemLi *sus 3 * * - * uint32 continue_state = 11; - * @return The continueState. + * uint32 next_floor_id = 11; + * @return The nextFloorId. */ - int getContinueState(); + int getNextFloorId(); /** * bool is_success = 12; @@ -87,7 +87,6 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemLi } /** * 
-   * 5.0.0
    * CmdId: 22669
    *
* @@ -149,7 +148,7 @@ private TowerLevelEndNotify( } case 24: { - nextFloorId_ = input.readUInt32(); + continueState_ = input.readUInt32(); break; } case 64: { @@ -175,7 +174,7 @@ private TowerLevelEndNotify( } case 88: { - continueState_ = input.readUInt32(); + nextFloorId_ = input.readUInt32(); break; } case 96: { @@ -222,6 +221,10 @@ private TowerLevelEndNotify( } /** + * 
+     * enum is old version
+     *
+ * * Protobuf enum {@code TowerLevelEndNotify.ContinueStateType} */ public enum ContinueStateType @@ -378,19 +381,19 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewar return rewardItemList_.get(index); } - public static final int NEXT_FLOOR_ID_FIELD_NUMBER = 3; - private int nextFloorId_; + public static final int CONTINUE_STATE_FIELD_NUMBER = 3; + private int continueState_; /** * 
      *sus 11
      *
* - * uint32 next_floor_id = 3; - * @return The nextFloorId. + * uint32 continue_state = 3; + * @return The continueState. */ @java.lang.Override - public int getNextFloorId() { - return nextFloorId_; + public int getContinueState() { + return continueState_; } public static final int FINISHED_STAR_COND_LIST_FIELD_NUMBER = 8; @@ -421,19 +424,19 @@ public int getFinishedStarCondList(int index) { } private int finishedStarCondListMemoizedSerializedSize = -1; - public static final int CONTINUE_STATE_FIELD_NUMBER = 11; - private int continueState_; + public static final int NEXT_FLOOR_ID_FIELD_NUMBER = 11; + private int nextFloorId_; /** * 
      *sus 3
      *
* - * uint32 continue_state = 11; - * @return The continueState. + * uint32 next_floor_id = 11; + * @return The nextFloorId. */ @java.lang.Override - public int getContinueState() { - return continueState_; + public int getNextFloorId() { + return nextFloorId_; } public static final int IS_SUCCESS_FIELD_NUMBER = 12; @@ -465,8 +468,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < rewardItemList_.size(); i++) { output.writeMessage(1, rewardItemList_.get(i)); } - if (nextFloorId_ != 0) { - output.writeUInt32(3, nextFloorId_); + if (continueState_ != 0) { + output.writeUInt32(3, continueState_); } if (getFinishedStarCondListList().size() > 0) { output.writeUInt32NoTag(66); @@ -475,8 +478,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < finishedStarCondList_.size(); i++) { output.writeUInt32NoTag(finishedStarCondList_.getInt(i)); } - if (continueState_ != 0) { - output.writeUInt32(11, continueState_); + if (nextFloorId_ != 0) { + output.writeUInt32(11, nextFloorId_); } if (isSuccess_ != false) { output.writeBool(12, isSuccess_); @@ -494,9 +497,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1, rewardItemList_.get(i)); } - if (nextFloorId_ != 0) { + if (continueState_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, nextFloorId_); + .computeUInt32Size(3, continueState_); } { int dataSize = 0; @@ -512,9 +515,9 @@ public int getSerializedSize() { } finishedStarCondListMemoizedSerializedSize = dataSize; } - if (continueState_ != 0) { + if (nextFloorId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, continueState_); + .computeUInt32Size(11, nextFloorId_); } if (isSuccess_ != false) { size += com.google.protobuf.CodedOutputStream @@ -537,12 +540,12 @@ public boolean equals(final java.lang.Object obj) { if (!getRewardItemListList() .equals(other.getRewardItemListList())) return false; - if (getNextFloorId() - != other.getNextFloorId()) return false; - if (!getFinishedStarCondListList() - .equals(other.getFinishedStarCondListList())) return false; if (getContinueState() != other.getContinueState()) return false; + if (!getFinishedStarCondListList() + .equals(other.getFinishedStarCondListList())) return false; + if (getNextFloorId() + != other.getNextFloorId()) return false; if (getIsSuccess() != other.getIsSuccess()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -560,14 +563,14 @@ public int hashCode() { hash = (37 * hash) + REWARD_ITEM_LIST_FIELD_NUMBER; hash = (53 * hash) + getRewardItemListList().hashCode(); } - hash = (37 * hash) + NEXT_FLOOR_ID_FIELD_NUMBER; - hash = (53 * hash) + getNextFloorId(); + hash = (37 * hash) + CONTINUE_STATE_FIELD_NUMBER; + hash = (53 * hash) + getContinueState(); if (getFinishedStarCondListCount() > 0) { hash = (37 * hash) + FINISHED_STAR_COND_LIST_FIELD_NUMBER; hash = (53 * hash) + getFinishedStarCondListList().hashCode(); } - hash = (37 * hash) + CONTINUE_STATE_FIELD_NUMBER; - hash = (53 * hash) + getContinueState(); + hash = (37 * hash) + NEXT_FLOOR_ID_FIELD_NUMBER; + hash = (53 * hash) + getNextFloorId(); hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSuccess()); @@ -668,7 +671,6 @@ protected Builder newBuilderForType( } /** * 
-     * 5.0.0
      * CmdId: 22669
      *
* @@ -716,11 +718,11 @@ public Builder clear() { } else { rewardItemListBuilder_.clear(); } - nextFloorId_ = 0; + continueState_ = 0; finishedStarCondList_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); - continueState_ = 0; + nextFloorId_ = 0; isSuccess_ = false; @@ -760,13 +762,13 @@ public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNoti } else { result.rewardItemList_ = rewardItemListBuilder_.build(); } - result.nextFloorId_ = nextFloorId_; + result.continueState_ = continueState_; if (((bitField0_ & 0x00000002) != 0)) { finishedStarCondList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.finishedStarCondList_ = finishedStarCondList_; - result.continueState_ = continueState_; + result.nextFloorId_ = nextFloorId_; result.isSuccess_ = isSuccess_; onBuilt(); return result; @@ -842,8 +844,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass } } } - if (other.getNextFloorId() != 0) { - setNextFloorId(other.getNextFloorId()); + if (other.getContinueState() != 0) { + setContinueState(other.getContinueState()); } if (!other.finishedStarCondList_.isEmpty()) { if (finishedStarCondList_.isEmpty()) { @@ -855,8 +857,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass } onChanged(); } - if (other.getContinueState() != 0) { - setContinueState(other.getContinueState()); + if (other.getNextFloorId() != 0) { + setNextFloorId(other.getNextFloorId()); } if (other.getIsSuccess() != false) { setIsSuccess(other.getIsSuccess()); @@ -1131,31 +1133,31 @@ public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addReward return rewardItemListBuilder_; } - private int nextFloorId_ ; + private int continueState_ ; /** * 
        *sus 11
        *
* - * uint32 next_floor_id = 3; - * @return The nextFloorId. + * uint32 continue_state = 3; + * @return The continueState. */ @java.lang.Override - public int getNextFloorId() { - return nextFloorId_; + public int getContinueState() { + return continueState_; } /** * 
        *sus 11
        *
* - * uint32 next_floor_id = 3; - * @param value The nextFloorId to set. + * uint32 continue_state = 3; + * @param value The continueState to set. * @return This builder for chaining. */ - public Builder setNextFloorId(int value) { + public Builder setContinueState(int value) { - nextFloorId_ = value; + continueState_ = value; onChanged(); return this; } @@ -1164,12 +1166,12 @@ public Builder setNextFloorId(int value) { *sus 11 * * - * uint32 next_floor_id = 3; + * uint32 continue_state = 3; * @return This builder for chaining. */ - public Builder clearNextFloorId() { + public Builder clearContinueState() { - nextFloorId_ = 0; + continueState_ = 0; onChanged(); return this; } @@ -1253,31 +1255,31 @@ public Builder clearFinishedStarCondList() { return this; } - private int continueState_ ; + private int nextFloorId_ ; /** * 
        *sus 3
        *
* - * uint32 continue_state = 11; - * @return The continueState. + * uint32 next_floor_id = 11; + * @return The nextFloorId. */ @java.lang.Override - public int getContinueState() { - return continueState_; + public int getNextFloorId() { + return nextFloorId_; } /** * 
        *sus 3
        *
* - * uint32 continue_state = 11; - * @param value The continueState to set. + * uint32 next_floor_id = 11; + * @param value The nextFloorId to set. * @return This builder for chaining. */ - public Builder setContinueState(int value) { + public Builder setNextFloorId(int value) { - continueState_ = value; + nextFloorId_ = value; onChanged(); return this; } @@ -1286,12 +1288,12 @@ public Builder setContinueState(int value) { *sus 3 * * - * uint32 continue_state = 11; + * uint32 next_floor_id = 11; * @return This builder for chaining. */ - public Builder clearContinueState() { + public Builder clearNextFloorId() { - continueState_ = 0; + nextFloorId_ = 0; onChanged(); return this; } @@ -1395,9 +1397,9 @@ public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNoti java.lang.String[] descriptorData = { "\n\031TowerLevelEndNotify.proto\032\017ItemParam.p" + "roto\"\273\002\n\023TowerLevelEndNotify\022$\n\020reward_i" + - "tem_list\030\001 \003(\0132\n.ItemParam\022\025\n\rnext_floor" + - "_id\030\003 \001(\r\022\037\n\027finished_star_cond_list\030\010 \003" + - "(\r\022\026\n\016continue_state\030\013 \001(\r\022\022\n\nis_success" + + "tem_list\030\001 \003(\0132\n.ItemParam\022\026\n\016continue_s" + + "tate\030\003 \001(\r\022\037\n\027finished_star_cond_list\030\010 " + + "\003(\r\022\025\n\rnext_floor_id\030\013 \001(\r\022\022\n\nis_success" + "\030\014 \001(\010\"\231\001\n\021ContinueStateType\022(\n$CONTINUE" + "_STATE_TYPE_CAN_NOT_CONTINUE\020\000\022,\n(CONTIN" + "UE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL\020\001\022,\n(" + @@ -1414,7 +1416,7 @@ public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNoti internal_static_TowerLevelEndNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerLevelEndNotify_descriptor, - new java.lang.String[] { "RewardItemList", "NextFloorId", "FinishedStarCondList", "ContinueState", "IsSuccess", }); + new java.lang.String[] { "RewardItemList", "ContinueState", "FinishedStarCondList", "NextFloorId", "IsSuccess", }); emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelRecordOuterClass.java index dd06344227c..a1729502c40 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelRecordOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelRecordOuterClass.java @@ -19,33 +19,29 @@ public interface TowerLevelRecordOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @return A list containing the satisfiedCondList. */ java.util.List getSatisfiedCondListList(); /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @return The count of satisfiedCondList. */ int getSatisfiedCondListCount(); /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @param index The index of the element to return. * @return The satisfiedCondList at the given index. */ int getSatisfiedCondList(int index); /** - * uint32 level_id = 9; + * uint32 level_id = 6; * @return The levelId. */ int getLevelId(); } /** - * 
-   * Obf: AIDBCLODKJO
-   *
- * * Protobuf type {@code TowerLevelRecord} */ public static final class TowerLevelRecord extends @@ -92,12 +88,7 @@ private TowerLevelRecord( case 0: done = true; break; - case 72: { - - levelId_ = input.readUInt32(); - break; - } - case 104: { + case 24: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { satisfiedCondList_ = newIntList(); mutable_bitField0_ |= 0x00000001; @@ -105,7 +96,7 @@ private TowerLevelRecord( satisfiedCondList_.addInt(input.readUInt32()); break; } - case 106: { + case 26: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -118,6 +109,11 @@ private TowerLevelRecord( input.popLimit(limit); break; } + case 48: { + + levelId_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -153,10 +149,10 @@ private TowerLevelRecord( emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.class, emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord.Builder.class); } - public static final int SATISFIED_COND_LIST_FIELD_NUMBER = 13; + public static final int SATISFIED_COND_LIST_FIELD_NUMBER = 3; private com.google.protobuf.Internal.IntList satisfiedCondList_; /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @return A list containing the satisfiedCondList. */ @java.lang.Override @@ -165,14 +161,14 @@ private TowerLevelRecord( return satisfiedCondList_; } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @return The count of satisfiedCondList. */ public int getSatisfiedCondListCount() { return satisfiedCondList_.size(); } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @param index The index of the element to return. * @return The satisfiedCondList at the given index. */ @@ -181,10 +177,10 @@ public int getSatisfiedCondList(int index) { } private int satisfiedCondListMemoizedSerializedSize = -1; - public static final int LEVEL_ID_FIELD_NUMBER = 9; + public static final int LEVEL_ID_FIELD_NUMBER = 6; private int levelId_; /** - * uint32 level_id = 9; + * uint32 level_id = 6; * @return The levelId. */ @java.lang.Override @@ -207,16 +203,16 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (levelId_ != 0) { - output.writeUInt32(9, levelId_); - } if (getSatisfiedCondListList().size() > 0) { - output.writeUInt32NoTag(106); + output.writeUInt32NoTag(26); output.writeUInt32NoTag(satisfiedCondListMemoizedSerializedSize); } for (int i = 0; i < satisfiedCondList_.size(); i++) { output.writeUInt32NoTag(satisfiedCondList_.getInt(i)); } + if (levelId_ != 0) { + output.writeUInt32(6, levelId_); + } unknownFields.writeTo(output); } @@ -226,10 +222,6 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (levelId_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, levelId_); - } { int dataSize = 0; for (int i = 0; i < satisfiedCondList_.size(); i++) { @@ -244,6 +236,10 @@ public int getSerializedSize() { } satisfiedCondListMemoizedSerializedSize = dataSize; } + if (levelId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(6, levelId_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -376,10 +372,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: AIDBCLODKJO
-     *
- * * Protobuf type {@code TowerLevelRecord} */ public static final class Builder extends @@ -553,7 +545,7 @@ private void ensureSatisfiedCondListIsMutable() { } } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @return A list containing the satisfiedCondList. */ public java.util.List @@ -562,14 +554,14 @@ private void ensureSatisfiedCondListIsMutable() { java.util.Collections.unmodifiableList(satisfiedCondList_) : satisfiedCondList_; } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @return The count of satisfiedCondList. */ public int getSatisfiedCondListCount() { return satisfiedCondList_.size(); } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @param index The index of the element to return. * @return The satisfiedCondList at the given index. */ @@ -577,7 +569,7 @@ public int getSatisfiedCondList(int index) { return satisfiedCondList_.getInt(index); } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @param index The index to set the value at. * @param value The satisfiedCondList to set. * @return This builder for chaining. @@ -590,7 +582,7 @@ public Builder setSatisfiedCondList( return this; } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @param value The satisfiedCondList to add. * @return This builder for chaining. */ @@ -601,7 +593,7 @@ public Builder addSatisfiedCondList(int value) { return this; } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @param values The satisfiedCondList to add. * @return This builder for chaining. */ @@ -614,7 +606,7 @@ public Builder addAllSatisfiedCondList( return this; } /** - * repeated uint32 satisfied_cond_list = 13; + * repeated uint32 satisfied_cond_list = 3; * @return This builder for chaining. */ public Builder clearSatisfiedCondList() { @@ -626,7 +618,7 @@ public Builder clearSatisfiedCondList() { private int levelId_ ; /** - * uint32 level_id = 9; + * uint32 level_id = 6; * @return The levelId. */ @java.lang.Override @@ -634,7 +626,7 @@ public int getLevelId() { return levelId_; } /** - * uint32 level_id = 9; + * uint32 level_id = 6; * @param value The levelId to set. * @return This builder for chaining. */ @@ -645,7 +637,7 @@ public Builder setLevelId(int value) { return this; } /** - * uint32 level_id = 9; + * uint32 level_id = 6; * @return This builder for chaining. */ public Builder clearLevelId() { @@ -722,8 +714,8 @@ public emu.grasscutter.net.proto.TowerLevelRecordOuterClass.TowerLevelRecord get static { java.lang.String[] descriptorData = { "\n\026TowerLevelRecord.proto\"A\n\020TowerLevelRe" + - "cord\022\033\n\023satisfied_cond_list\030\r \003(\r\022\020\n\010lev" + - "el_id\030\t \001(\rB\033\n\031emu.grasscutter.net.proto" + + "cord\022\033\n\023satisfied_cond_list\030\003 \003(\r\022\020\n\010lev" + + "el_id\030\006 \001(\rB\033\n\031emu.grasscutter.net.proto" + "b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelStarCondDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelStarCondDataOuterClass.java index 322abc0634c..6a6023ed69a 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelStarCondDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelStarCondDataOuterClass.java @@ -19,34 +19,46 @@ public interface TowerLevelStarCondDataOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 NGHNFHCLFBH = 12; - * @return The nGHNFHCLFBH. + * 
+     * sus
+     *
+ * + * bool is_fail = 4; + * @return The isFail. */ - int getNGHNFHCLFBH(); + boolean getIsFail(); /** - * bool IBGHBFANCBK = 6; - * @return The iBGHBFANCBK. + * 
+     * sus
+     *
+ * + * uint32 cond_value = 9; + * @return The condValue. */ - boolean getIBGHBFANCBK(); + int getCondValue(); /** - * bool OILLLBMMABH = 9; - * @return The oILLLBMMABH. + * 
+     * sus
+     *
+ * + * bool is_pause = 12; + * @return The isPause. */ - boolean getOILLLBMMABH(); + boolean getIsPause(); /** - * uint32 OMOECEGOALC = 2; - * @return The oMOECEGOALC. + * 
+     * sus
+     *
+ * + * uint32 star_cond_index = 14; + * @return The starCondIndex. */ - int getOMOECEGOALC(); + int getStarCondIndex(); } /** - * 
-   * Obf: CJAADENOOAJ
-   *
- * * Protobuf type {@code TowerLevelStarCondData} */ public static final class TowerLevelStarCondData extends @@ -91,24 +103,24 @@ private TowerLevelStarCondData( case 0: done = true; break; - case 16: { + case 32: { - oMOECEGOALC_ = input.readUInt32(); + isFail_ = input.readBool(); break; } - case 48: { + case 72: { - iBGHBFANCBK_ = input.readBool(); + condValue_ = input.readUInt32(); break; } - case 72: { + case 96: { - oILLLBMMABH_ = input.readBool(); + isPause_ = input.readBool(); break; } - case 96: { + case 112: { - nGHNFHCLFBH_ = input.readUInt32(); + starCondIndex_ = input.readUInt32(); break; } default: { @@ -143,48 +155,64 @@ private TowerLevelStarCondData( emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.class, emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.Builder.class); } - public static final int NGHNFHCLFBH_FIELD_NUMBER = 12; - private int nGHNFHCLFBH_; + public static final int IS_FAIL_FIELD_NUMBER = 4; + private boolean isFail_; /** - * uint32 NGHNFHCLFBH = 12; - * @return The nGHNFHCLFBH. + * 
+     * sus
+     *
+ * + * bool is_fail = 4; + * @return The isFail. */ @java.lang.Override - public int getNGHNFHCLFBH() { - return nGHNFHCLFBH_; + public boolean getIsFail() { + return isFail_; } - public static final int IBGHBFANCBK_FIELD_NUMBER = 6; - private boolean iBGHBFANCBK_; + public static final int COND_VALUE_FIELD_NUMBER = 9; + private int condValue_; /** - * bool IBGHBFANCBK = 6; - * @return The iBGHBFANCBK. + * 
+     * sus
+     *
+ * + * uint32 cond_value = 9; + * @return The condValue. */ @java.lang.Override - public boolean getIBGHBFANCBK() { - return iBGHBFANCBK_; + public int getCondValue() { + return condValue_; } - public static final int OILLLBMMABH_FIELD_NUMBER = 9; - private boolean oILLLBMMABH_; + public static final int IS_PAUSE_FIELD_NUMBER = 12; + private boolean isPause_; /** - * bool OILLLBMMABH = 9; - * @return The oILLLBMMABH. + * 
+     * sus
+     *
+ * + * bool is_pause = 12; + * @return The isPause. */ @java.lang.Override - public boolean getOILLLBMMABH() { - return oILLLBMMABH_; + public boolean getIsPause() { + return isPause_; } - public static final int OMOECEGOALC_FIELD_NUMBER = 2; - private int oMOECEGOALC_; + public static final int STAR_COND_INDEX_FIELD_NUMBER = 14; + private int starCondIndex_; /** - * uint32 OMOECEGOALC = 2; - * @return The oMOECEGOALC. + * 
+     * sus
+     *
+ * + * uint32 star_cond_index = 14; + * @return The starCondIndex. */ @java.lang.Override - public int getOMOECEGOALC() { - return oMOECEGOALC_; + public int getStarCondIndex() { + return starCondIndex_; } private byte memoizedIsInitialized = -1; @@ -201,17 +229,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (oMOECEGOALC_ != 0) { - output.writeUInt32(2, oMOECEGOALC_); + if (isFail_ != false) { + output.writeBool(4, isFail_); } - if (iBGHBFANCBK_ != false) { - output.writeBool(6, iBGHBFANCBK_); + if (condValue_ != 0) { + output.writeUInt32(9, condValue_); } - if (oILLLBMMABH_ != false) { - output.writeBool(9, oILLLBMMABH_); + if (isPause_ != false) { + output.writeBool(12, isPause_); } - if (nGHNFHCLFBH_ != 0) { - output.writeUInt32(12, nGHNFHCLFBH_); + if (starCondIndex_ != 0) { + output.writeUInt32(14, starCondIndex_); } unknownFields.writeTo(output); } @@ -222,21 +250,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (oMOECEGOALC_ != 0) { + if (isFail_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, oMOECEGOALC_); + .computeBoolSize(4, isFail_); } - if (iBGHBFANCBK_ != false) { + if (condValue_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, iBGHBFANCBK_); + .computeUInt32Size(9, condValue_); } - if (oILLLBMMABH_ != false) { + if (isPause_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(9, oILLLBMMABH_); + .computeBoolSize(12, isPause_); } - if (nGHNFHCLFBH_ != 0) { + if (starCondIndex_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, nGHNFHCLFBH_); + .computeUInt32Size(14, starCondIndex_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -253,14 +281,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData other = (emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData) obj; - if (getNGHNFHCLFBH() - != other.getNGHNFHCLFBH()) return false; - if (getIBGHBFANCBK() - != other.getIBGHBFANCBK()) return false; - if (getOILLLBMMABH() - != other.getOILLLBMMABH()) return false; - if (getOMOECEGOALC() - != other.getOMOECEGOALC()) return false; + if (getIsFail() + != other.getIsFail()) return false; + if (getCondValue() + != other.getCondValue()) return false; + if (getIsPause() + != other.getIsPause()) return false; + if (getStarCondIndex() + != other.getStarCondIndex()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -272,16 +300,16 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + NGHNFHCLFBH_FIELD_NUMBER; - hash = (53 * hash) + getNGHNFHCLFBH(); - hash = (37 * hash) + IBGHBFANCBK_FIELD_NUMBER; + hash = (37 * hash) + IS_FAIL_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getIBGHBFANCBK()); - hash = (37 * hash) + OILLLBMMABH_FIELD_NUMBER; + getIsFail()); + hash = (37 * hash) + COND_VALUE_FIELD_NUMBER; + hash = (53 * hash) + getCondValue(); + hash = (37 * hash) + IS_PAUSE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getOILLLBMMABH()); - hash = (37 * hash) + OMOECEGOALC_FIELD_NUMBER; - hash = (53 * hash) + getOMOECEGOALC(); + getIsPause()); + hash = (37 * hash) + STAR_COND_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getStarCondIndex(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -378,10 +406,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: CJAADENOOAJ
-     *
- * * Protobuf type {@code TowerLevelStarCondData} */ public static final class Builder extends @@ -419,13 +443,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - nGHNFHCLFBH_ = 0; + isFail_ = false; - iBGHBFANCBK_ = false; + condValue_ = 0; - oILLLBMMABH_ = false; + isPause_ = false; - oMOECEGOALC_ = 0; + starCondIndex_ = 0; return this; } @@ -453,10 +477,10 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar @java.lang.Override public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData buildPartial() { emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData result = new emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData(this); - result.nGHNFHCLFBH_ = nGHNFHCLFBH_; - result.iBGHBFANCBK_ = iBGHBFANCBK_; - result.oILLLBMMABH_ = oILLLBMMABH_; - result.oMOECEGOALC_ = oMOECEGOALC_; + result.isFail_ = isFail_; + result.condValue_ = condValue_; + result.isPause_ = isPause_; + result.starCondIndex_ = starCondIndex_; onBuilt(); return result; } @@ -505,17 +529,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData other) { if (other == emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.getDefaultInstance()) return this; - if (other.getNGHNFHCLFBH() != 0) { - setNGHNFHCLFBH(other.getNGHNFHCLFBH()); + if (other.getIsFail() != false) { + setIsFail(other.getIsFail()); } - if (other.getIBGHBFANCBK() != false) { - setIBGHBFANCBK(other.getIBGHBFANCBK()); + if (other.getCondValue() != 0) { + setCondValue(other.getCondValue()); } - if (other.getOILLLBMMABH() != false) { - setOILLLBMMABH(other.getOILLLBMMABH()); + if (other.getIsPause() != false) { + setIsPause(other.getIsPause()); } - if (other.getOMOECEGOALC() != 0) { - setOMOECEGOALC(other.getOMOECEGOALC()); + if (other.getStarCondIndex() != 0) { + setStarCondIndex(other.getStarCondIndex()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -546,126 +570,174 @@ public Builder mergeFrom( return this; } - private int nGHNFHCLFBH_ ; + private boolean isFail_ ; /** - * uint32 NGHNFHCLFBH = 12; - * @return The nGHNFHCLFBH. + * 
+       * sus
+       *
+ * + * bool is_fail = 4; + * @return The isFail. */ @java.lang.Override - public int getNGHNFHCLFBH() { - return nGHNFHCLFBH_; + public boolean getIsFail() { + return isFail_; } /** - * uint32 NGHNFHCLFBH = 12; - * @param value The nGHNFHCLFBH to set. + * 
+       * sus
+       *
+ * + * bool is_fail = 4; + * @param value The isFail to set. * @return This builder for chaining. */ - public Builder setNGHNFHCLFBH(int value) { + public Builder setIsFail(boolean value) { - nGHNFHCLFBH_ = value; + isFail_ = value; onChanged(); return this; } /** - * uint32 NGHNFHCLFBH = 12; + * 
+       * sus
+       *
+ * + * bool is_fail = 4; * @return This builder for chaining. */ - public Builder clearNGHNFHCLFBH() { + public Builder clearIsFail() { - nGHNFHCLFBH_ = 0; + isFail_ = false; onChanged(); return this; } - private boolean iBGHBFANCBK_ ; + private int condValue_ ; /** - * bool IBGHBFANCBK = 6; - * @return The iBGHBFANCBK. + * 
+       * sus
+       *
+ * + * uint32 cond_value = 9; + * @return The condValue. */ @java.lang.Override - public boolean getIBGHBFANCBK() { - return iBGHBFANCBK_; + public int getCondValue() { + return condValue_; } /** - * bool IBGHBFANCBK = 6; - * @param value The iBGHBFANCBK to set. + * 
+       * sus
+       *
+ * + * uint32 cond_value = 9; + * @param value The condValue to set. * @return This builder for chaining. */ - public Builder setIBGHBFANCBK(boolean value) { + public Builder setCondValue(int value) { - iBGHBFANCBK_ = value; + condValue_ = value; onChanged(); return this; } /** - * bool IBGHBFANCBK = 6; + * 
+       * sus
+       *
+ * + * uint32 cond_value = 9; * @return This builder for chaining. */ - public Builder clearIBGHBFANCBK() { + public Builder clearCondValue() { - iBGHBFANCBK_ = false; + condValue_ = 0; onChanged(); return this; } - private boolean oILLLBMMABH_ ; + private boolean isPause_ ; /** - * bool OILLLBMMABH = 9; - * @return The oILLLBMMABH. + * 
+       * sus
+       *
+ * + * bool is_pause = 12; + * @return The isPause. */ @java.lang.Override - public boolean getOILLLBMMABH() { - return oILLLBMMABH_; + public boolean getIsPause() { + return isPause_; } /** - * bool OILLLBMMABH = 9; - * @param value The oILLLBMMABH to set. + * 
+       * sus
+       *
+ * + * bool is_pause = 12; + * @param value The isPause to set. * @return This builder for chaining. */ - public Builder setOILLLBMMABH(boolean value) { + public Builder setIsPause(boolean value) { - oILLLBMMABH_ = value; + isPause_ = value; onChanged(); return this; } /** - * bool OILLLBMMABH = 9; + * 
+       * sus
+       *
+ * + * bool is_pause = 12; * @return This builder for chaining. */ - public Builder clearOILLLBMMABH() { + public Builder clearIsPause() { - oILLLBMMABH_ = false; + isPause_ = false; onChanged(); return this; } - private int oMOECEGOALC_ ; + private int starCondIndex_ ; /** - * uint32 OMOECEGOALC = 2; - * @return The oMOECEGOALC. + * 
+       * sus
+       *
+ * + * uint32 star_cond_index = 14; + * @return The starCondIndex. */ @java.lang.Override - public int getOMOECEGOALC() { - return oMOECEGOALC_; + public int getStarCondIndex() { + return starCondIndex_; } /** - * uint32 OMOECEGOALC = 2; - * @param value The oMOECEGOALC to set. + * 
+       * sus
+       *
+ * + * uint32 star_cond_index = 14; + * @param value The starCondIndex to set. * @return This builder for chaining. */ - public Builder setOMOECEGOALC(int value) { + public Builder setStarCondIndex(int value) { - oMOECEGOALC_ = value; + starCondIndex_ = value; onChanged(); return this; } /** - * uint32 OMOECEGOALC = 2; + * 
+       * sus
+       *
+ * + * uint32 star_cond_index = 14; * @return This builder for chaining. */ - public Builder clearOMOECEGOALC() { + public Builder clearStarCondIndex() { - oMOECEGOALC_ = 0; + starCondIndex_ = 0; onChanged(); return this; } @@ -736,11 +808,11 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar descriptor; static { java.lang.String[] descriptorData = { - "\n\034TowerLevelStarCondData.proto\"l\n\026TowerL" + - "evelStarCondData\022\023\n\013NGHNFHCLFBH\030\014 \001(\r\022\023\n" + - "\013IBGHBFANCBK\030\006 \001(\010\022\023\n\013OILLLBMMABH\030\t \001(\010\022" + - "\023\n\013OMOECEGOALC\030\002 \001(\rB\033\n\031emu.grasscutter." + - "net.protob\006proto3" + "\n\034TowerLevelStarCondData.proto\"h\n\026TowerL" + + "evelStarCondData\022\017\n\007is_fail\030\004 \001(\010\022\022\n\ncon" + + "d_value\030\t \001(\r\022\020\n\010is_pause\030\014 \001(\010\022\027\n\017star_" + + "cond_index\030\016 \001(\rB\033\n\031emu.grasscutter.net." + + "protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -751,7 +823,7 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar internal_static_TowerLevelStarCondData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerLevelStarCondData_descriptor, - new java.lang.String[] { "NGHNFHCLFBH", "IBGHBFANCBK", "OILLLBMMABH", "OMOECEGOALC", }); + new java.lang.String[] { "IsFail", "CondValue", "IsPause", "StarCondIndex", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelStarCondNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelStarCondNotifyOuterClass.java index 0e2c9835c60..55bfac6e63b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelStarCondNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelStarCondNotifyOuterClass.java @@ -19,45 +19,44 @@ public interface TowerLevelStarCondNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 floor_id = 9; + * uint32 floor_id = 3; * @return The floorId. */ int getFloorId(); /** - * uint32 level_index = 2; - * @return The levelIndex. - */ - int getLevelIndex(); - - /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ java.util.List getCondDataListList(); /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData getCondDataList(int index); /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ int getCondDataListCount(); /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ java.util.List getCondDataListOrBuilderList(); /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondDataOrBuilder getCondDataListOrBuilder( int index); + + /** + * uint32 level_index = 8; + * @return The levelIndex. + */ + int getLevelIndex(); } /** * 
-   * CmdId: 2042
-   * Obf: ALNLBDBGCAE
+   * CmdId: 23130
    *
* * Protobuf type {@code TowerLevelStarCondNotify} @@ -106,17 +105,12 @@ private TowerLevelStarCondNotify( case 0: done = true; break; - case 16: { - - levelIndex_ = input.readUInt32(); - break; - } - case 72: { + case 24: { floorId_ = input.readUInt32(); break; } - case 82: { + case 34: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { condDataList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -125,6 +119,11 @@ private TowerLevelStarCondNotify( input.readMessage(emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.parser(), extensionRegistry)); break; } + case 64: { + + levelIndex_ = input.readUInt32(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -160,10 +159,10 @@ private TowerLevelStarCondNotify( emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelStarCondNotify.class, emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelStarCondNotify.Builder.class); } - public static final int FLOOR_ID_FIELD_NUMBER = 9; + public static final int FLOOR_ID_FIELD_NUMBER = 3; private int floorId_; /** - * uint32 floor_id = 9; + * uint32 floor_id = 3; * @return The floorId. */ @java.lang.Override @@ -171,28 +170,17 @@ public int getFloorId() { return floorId_; } - public static final int LEVEL_INDEX_FIELD_NUMBER = 2; - private int levelIndex_; - /** - * uint32 level_index = 2; - * @return The levelIndex. - */ - @java.lang.Override - public int getLevelIndex() { - return levelIndex_; - } - - public static final int COND_DATA_LIST_FIELD_NUMBER = 10; + public static final int COND_DATA_LIST_FIELD_NUMBER = 4; private java.util.List condDataList_; /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ @java.lang.Override public java.util.List getCondDataListList() { return condDataList_; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ @java.lang.Override public java.util.List @@ -200,21 +188,21 @@ public java.util.Listrepeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ @java.lang.Override public int getCondDataListCount() { return condDataList_.size(); } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ @java.lang.Override public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData getCondDataList(int index) { return condDataList_.get(index); } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ @java.lang.Override public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondDataOrBuilder getCondDataListOrBuilder( @@ -222,6 +210,17 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar return condDataList_.get(index); } + public static final int LEVEL_INDEX_FIELD_NUMBER = 8; + private int levelIndex_; + /** + * uint32 level_index = 8; + * @return The levelIndex. + */ + @java.lang.Override + public int getLevelIndex() { + return levelIndex_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -236,14 +235,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (levelIndex_ != 0) { - output.writeUInt32(2, levelIndex_); - } if (floorId_ != 0) { - output.writeUInt32(9, floorId_); + output.writeUInt32(3, floorId_); } for (int i = 0; i < condDataList_.size(); i++) { - output.writeMessage(10, condDataList_.get(i)); + output.writeMessage(4, condDataList_.get(i)); + } + if (levelIndex_ != 0) { + output.writeUInt32(8, levelIndex_); } unknownFields.writeTo(output); } @@ -254,17 +253,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (levelIndex_ != 0) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, levelIndex_); - } if (floorId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, floorId_); + .computeUInt32Size(3, floorId_); } for (int i = 0; i < condDataList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, condDataList_.get(i)); + .computeMessageSize(4, condDataList_.get(i)); + } + if (levelIndex_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(8, levelIndex_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -283,10 +282,10 @@ public boolean equals(final java.lang.Object obj) { if (getFloorId() != other.getFloorId()) return false; - if (getLevelIndex() - != other.getLevelIndex()) return false; if (!getCondDataListList() .equals(other.getCondDataListList())) return false; + if (getLevelIndex() + != other.getLevelIndex()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -300,12 +299,12 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + FLOOR_ID_FIELD_NUMBER; hash = (53 * hash) + getFloorId(); - hash = (37 * hash) + LEVEL_INDEX_FIELD_NUMBER; - hash = (53 * hash) + getLevelIndex(); if (getCondDataListCount() > 0) { hash = (37 * hash) + COND_DATA_LIST_FIELD_NUMBER; hash = (53 * hash) + getCondDataListList().hashCode(); } + hash = (37 * hash) + LEVEL_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getLevelIndex(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -403,8 +402,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2042
-     * Obf: ALNLBDBGCAE
+     * CmdId: 23130
      *
* * Protobuf type {@code TowerLevelStarCondNotify} @@ -447,14 +445,14 @@ public Builder clear() { super.clear(); floorId_ = 0; - levelIndex_ = 0; - if (condDataListBuilder_ == null) { condDataList_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { condDataListBuilder_.clear(); } + levelIndex_ = 0; + return this; } @@ -483,7 +481,6 @@ public emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelSt emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelStarCondNotify result = new emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelStarCondNotify(this); int from_bitField0_ = bitField0_; result.floorId_ = floorId_; - result.levelIndex_ = levelIndex_; if (condDataListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { condDataList_ = java.util.Collections.unmodifiableList(condDataList_); @@ -493,6 +490,7 @@ public emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelSt } else { result.condDataList_ = condDataListBuilder_.build(); } + result.levelIndex_ = levelIndex_; onBuilt(); return result; } @@ -544,9 +542,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuter if (other.getFloorId() != 0) { setFloorId(other.getFloorId()); } - if (other.getLevelIndex() != 0) { - setLevelIndex(other.getLevelIndex()); - } if (condDataListBuilder_ == null) { if (!other.condDataList_.isEmpty()) { if (condDataList_.isEmpty()) { @@ -573,6 +568,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuter } } } + if (other.getLevelIndex() != 0) { + setLevelIndex(other.getLevelIndex()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -605,7 +603,7 @@ public Builder mergeFrom( private int floorId_ ; /** - * uint32 floor_id = 9; + * uint32 floor_id = 3; * @return The floorId. */ @java.lang.Override @@ -613,7 +611,7 @@ public int getFloorId() { return floorId_; } /** - * uint32 floor_id = 9; + * uint32 floor_id = 3; * @param value The floorId to set. * @return This builder for chaining. */ @@ -624,7 +622,7 @@ public Builder setFloorId(int value) { return this; } /** - * uint32 floor_id = 9; + * uint32 floor_id = 3; * @return This builder for chaining. */ public Builder clearFloorId() { @@ -634,37 +632,6 @@ public Builder clearFloorId() { return this; } - private int levelIndex_ ; - /** - * uint32 level_index = 2; - * @return The levelIndex. - */ - @java.lang.Override - public int getLevelIndex() { - return levelIndex_; - } - /** - * uint32 level_index = 2; - * @param value The levelIndex to set. - * @return This builder for chaining. - */ - public Builder setLevelIndex(int value) { - - levelIndex_ = value; - onChanged(); - return this; - } - /** - * uint32 level_index = 2; - * @return This builder for chaining. - */ - public Builder clearLevelIndex() { - - levelIndex_ = 0; - onChanged(); - return this; - } - private java.util.List condDataList_ = java.util.Collections.emptyList(); private void ensureCondDataListIsMutable() { @@ -678,7 +645,7 @@ private void ensureCondDataListIsMutable() { emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData, emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.Builder, emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondDataOrBuilder> condDataListBuilder_; /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public java.util.List getCondDataListList() { if (condDataListBuilder_ == null) { @@ -688,7 +655,7 @@ public java.util.Listrepeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public int getCondDataListCount() { if (condDataListBuilder_ == null) { @@ -698,7 +665,7 @@ public int getCondDataListCount() { } } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData getCondDataList(int index) { if (condDataListBuilder_ == null) { @@ -708,7 +675,7 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar } } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder setCondDataList( int index, emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData value) { @@ -725,7 +692,7 @@ public Builder setCondDataList( return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder setCondDataList( int index, emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.Builder builderForValue) { @@ -739,7 +706,7 @@ public Builder setCondDataList( return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder addCondDataList(emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData value) { if (condDataListBuilder_ == null) { @@ -755,7 +722,7 @@ public Builder addCondDataList(emu.grasscutter.net.proto.TowerLevelStarCondDataO return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder addCondDataList( int index, emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData value) { @@ -772,7 +739,7 @@ public Builder addCondDataList( return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder addCondDataList( emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.Builder builderForValue) { @@ -786,7 +753,7 @@ public Builder addCondDataList( return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder addCondDataList( int index, emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.Builder builderForValue) { @@ -800,7 +767,7 @@ public Builder addCondDataList( return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder addAllCondDataList( java.lang.Iterable values) { @@ -815,7 +782,7 @@ public Builder addAllCondDataList( return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder clearCondDataList() { if (condDataListBuilder_ == null) { @@ -828,7 +795,7 @@ public Builder clearCondDataList() { return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public Builder removeCondDataList(int index) { if (condDataListBuilder_ == null) { @@ -841,14 +808,14 @@ public Builder removeCondDataList(int index) { return this; } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.Builder getCondDataListBuilder( int index) { return getCondDataListFieldBuilder().getBuilder(index); } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondDataOrBuilder getCondDataListOrBuilder( int index) { @@ -858,7 +825,7 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar } } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public java.util.List getCondDataListOrBuilderList() { @@ -869,14 +836,14 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar } } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.Builder addCondDataListBuilder() { return getCondDataListFieldBuilder().addBuilder( emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.getDefaultInstance()); } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.Builder addCondDataListBuilder( int index) { @@ -884,7 +851,7 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar index, emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStarCondData.getDefaultInstance()); } /** - * repeated .TowerLevelStarCondData cond_data_list = 10; + * repeated .TowerLevelStarCondData cond_data_list = 4; */ public java.util.List getCondDataListBuilderList() { @@ -904,6 +871,37 @@ public emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.TowerLevelStar } return condDataListBuilder_; } + + private int levelIndex_ ; + /** + * uint32 level_index = 8; + * @return The levelIndex. + */ + @java.lang.Override + public int getLevelIndex() { + return levelIndex_; + } + /** + * uint32 level_index = 8; + * @param value The levelIndex to set. + * @return This builder for chaining. + */ + public Builder setLevelIndex(int value) { + + levelIndex_ = value; + onChanged(); + return this; + } + /** + * uint32 level_index = 8; + * @return This builder for chaining. + */ + public Builder clearLevelIndex() { + + levelIndex_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -973,9 +971,9 @@ public emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelSt java.lang.String[] descriptorData = { "\n\036TowerLevelStarCondNotify.proto\032\034TowerL" + "evelStarCondData.proto\"r\n\030TowerLevelStar" + - "CondNotify\022\020\n\010floor_id\030\t \001(\r\022\023\n\013level_in" + - "dex\030\002 \001(\r\022/\n\016cond_data_list\030\n \003(\0132\027.Towe" + - "rLevelStarCondDataB\033\n\031emu.grasscutter.ne" + + "CondNotify\022\020\n\010floor_id\030\003 \001(\r\022/\n\016cond_dat" + + "a_list\030\004 \003(\0132\027.TowerLevelStarCondData\022\023\n" + + "\013level_index\030\010 \001(\rB\033\n\031emu.grasscutter.ne" + "t.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -988,7 +986,7 @@ public emu.grasscutter.net.proto.TowerLevelStarCondNotifyOuterClass.TowerLevelSt internal_static_TowerLevelStarCondNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerLevelStarCondNotify_descriptor, - new java.lang.String[] { "FloorId", "LevelIndex", "CondDataList", }); + new java.lang.String[] { "FloorId", "CondDataList", "LevelIndex", }); emu.grasscutter.net.proto.TowerLevelStarCondDataOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyBriefOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyBriefOuterClass.java index 13f62c03ea6..b00639aabeb 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyBriefOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyBriefOuterClass.java @@ -19,34 +19,30 @@ public interface TowerMonthlyBriefOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 DLPIFFMADHI = 13; - * @return The dLPIFFMADHI. + * uint32 tower_schedule_id = 5; + * @return The towerScheduleId. */ - int getDLPIFFMADHI(); + int getTowerScheduleId(); /** - * uint32 MEJOLHPJGJK = 5; - * @return The mEJOLHPJGJK. + * uint32 total_star_count = 10; + * @return The totalStarCount. */ - int getMEJOLHPJGJK(); + int getTotalStarCount(); /** - * uint32 tower_schedule_id = 6; - * @return The towerScheduleId. + * uint32 best_level_index = 11; + * @return The bestLevelIndex. */ - int getTowerScheduleId(); + int getBestLevelIndex(); /** - * uint32 KCGJAFBPCLB = 2; - * @return The kCGJAFBPCLB. + * uint32 best_floor_index = 15; + * @return The bestFloorIndex. */ - int getKCGJAFBPCLB(); + int getBestFloorIndex(); } /** - * 
-   * Obf: HHBHKONDDNK
-   *
- * * Protobuf type {@code TowerMonthlyBrief} */ public static final class TowerMonthlyBrief extends @@ -91,24 +87,24 @@ private TowerMonthlyBrief( case 0: done = true; break; - case 16: { + case 40: { - kCGJAFBPCLB_ = input.readUInt32(); + towerScheduleId_ = input.readUInt32(); break; } - case 40: { + case 80: { - mEJOLHPJGJK_ = input.readUInt32(); + totalStarCount_ = input.readUInt32(); break; } - case 48: { + case 88: { - towerScheduleId_ = input.readUInt32(); + bestLevelIndex_ = input.readUInt32(); break; } - case 104: { + case 120: { - dLPIFFMADHI_ = input.readUInt32(); + bestFloorIndex_ = input.readUInt32(); break; } default: { @@ -143,48 +139,48 @@ private TowerMonthlyBrief( emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.class, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder.class); } - public static final int DLPIFFMADHI_FIELD_NUMBER = 13; - private int dLPIFFMADHI_; + public static final int TOWER_SCHEDULE_ID_FIELD_NUMBER = 5; + private int towerScheduleId_; /** - * uint32 DLPIFFMADHI = 13; - * @return The dLPIFFMADHI. + * uint32 tower_schedule_id = 5; + * @return The towerScheduleId. */ @java.lang.Override - public int getDLPIFFMADHI() { - return dLPIFFMADHI_; + public int getTowerScheduleId() { + return towerScheduleId_; } - public static final int MEJOLHPJGJK_FIELD_NUMBER = 5; - private int mEJOLHPJGJK_; + public static final int TOTAL_STAR_COUNT_FIELD_NUMBER = 10; + private int totalStarCount_; /** - * uint32 MEJOLHPJGJK = 5; - * @return The mEJOLHPJGJK. + * uint32 total_star_count = 10; + * @return The totalStarCount. */ @java.lang.Override - public int getMEJOLHPJGJK() { - return mEJOLHPJGJK_; + public int getTotalStarCount() { + return totalStarCount_; } - public static final int TOWER_SCHEDULE_ID_FIELD_NUMBER = 6; - private int towerScheduleId_; + public static final int BEST_LEVEL_INDEX_FIELD_NUMBER = 11; + private int bestLevelIndex_; /** - * uint32 tower_schedule_id = 6; - * @return The towerScheduleId. + * uint32 best_level_index = 11; + * @return The bestLevelIndex. */ @java.lang.Override - public int getTowerScheduleId() { - return towerScheduleId_; + public int getBestLevelIndex() { + return bestLevelIndex_; } - public static final int KCGJAFBPCLB_FIELD_NUMBER = 2; - private int kCGJAFBPCLB_; + public static final int BEST_FLOOR_INDEX_FIELD_NUMBER = 15; + private int bestFloorIndex_; /** - * uint32 KCGJAFBPCLB = 2; - * @return The kCGJAFBPCLB. + * uint32 best_floor_index = 15; + * @return The bestFloorIndex. */ @java.lang.Override - public int getKCGJAFBPCLB() { - return kCGJAFBPCLB_; + public int getBestFloorIndex() { + return bestFloorIndex_; } private byte memoizedIsInitialized = -1; @@ -201,17 +197,17 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (kCGJAFBPCLB_ != 0) { - output.writeUInt32(2, kCGJAFBPCLB_); + if (towerScheduleId_ != 0) { + output.writeUInt32(5, towerScheduleId_); } - if (mEJOLHPJGJK_ != 0) { - output.writeUInt32(5, mEJOLHPJGJK_); + if (totalStarCount_ != 0) { + output.writeUInt32(10, totalStarCount_); } - if (towerScheduleId_ != 0) { - output.writeUInt32(6, towerScheduleId_); + if (bestLevelIndex_ != 0) { + output.writeUInt32(11, bestLevelIndex_); } - if (dLPIFFMADHI_ != 0) { - output.writeUInt32(13, dLPIFFMADHI_); + if (bestFloorIndex_ != 0) { + output.writeUInt32(15, bestFloorIndex_); } unknownFields.writeTo(output); } @@ -222,21 +218,21 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (kCGJAFBPCLB_ != 0) { + if (towerScheduleId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, kCGJAFBPCLB_); + .computeUInt32Size(5, towerScheduleId_); } - if (mEJOLHPJGJK_ != 0) { + if (totalStarCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, mEJOLHPJGJK_); + .computeUInt32Size(10, totalStarCount_); } - if (towerScheduleId_ != 0) { + if (bestLevelIndex_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(6, towerScheduleId_); + .computeUInt32Size(11, bestLevelIndex_); } - if (dLPIFFMADHI_ != 0) { + if (bestFloorIndex_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(13, dLPIFFMADHI_); + .computeUInt32Size(15, bestFloorIndex_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -253,14 +249,14 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief other = (emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief) obj; - if (getDLPIFFMADHI() - != other.getDLPIFFMADHI()) return false; - if (getMEJOLHPJGJK() - != other.getMEJOLHPJGJK()) return false; if (getTowerScheduleId() != other.getTowerScheduleId()) return false; - if (getKCGJAFBPCLB() - != other.getKCGJAFBPCLB()) return false; + if (getTotalStarCount() + != other.getTotalStarCount()) return false; + if (getBestLevelIndex() + != other.getBestLevelIndex()) return false; + if (getBestFloorIndex() + != other.getBestFloorIndex()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -272,14 +268,14 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + DLPIFFMADHI_FIELD_NUMBER; - hash = (53 * hash) + getDLPIFFMADHI(); - hash = (37 * hash) + MEJOLHPJGJK_FIELD_NUMBER; - hash = (53 * hash) + getMEJOLHPJGJK(); hash = (37 * hash) + TOWER_SCHEDULE_ID_FIELD_NUMBER; hash = (53 * hash) + getTowerScheduleId(); - hash = (37 * hash) + KCGJAFBPCLB_FIELD_NUMBER; - hash = (53 * hash) + getKCGJAFBPCLB(); + hash = (37 * hash) + TOTAL_STAR_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getTotalStarCount(); + hash = (37 * hash) + BEST_LEVEL_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getBestLevelIndex(); + hash = (37 * hash) + BEST_FLOOR_INDEX_FIELD_NUMBER; + hash = (53 * hash) + getBestFloorIndex(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -376,10 +372,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: HHBHKONDDNK
-     *
- * * Protobuf type {@code TowerMonthlyBrief} */ public static final class Builder extends @@ -417,13 +409,13 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - dLPIFFMADHI_ = 0; + towerScheduleId_ = 0; - mEJOLHPJGJK_ = 0; + totalStarCount_ = 0; - towerScheduleId_ = 0; + bestLevelIndex_ = 0; - kCGJAFBPCLB_ = 0; + bestFloorIndex_ = 0; return this; } @@ -451,10 +443,10 @@ public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief b @java.lang.Override public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief buildPartial() { emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief result = new emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief(this); - result.dLPIFFMADHI_ = dLPIFFMADHI_; - result.mEJOLHPJGJK_ = mEJOLHPJGJK_; result.towerScheduleId_ = towerScheduleId_; - result.kCGJAFBPCLB_ = kCGJAFBPCLB_; + result.totalStarCount_ = totalStarCount_; + result.bestLevelIndex_ = bestLevelIndex_; + result.bestFloorIndex_ = bestFloorIndex_; onBuilt(); return result; } @@ -503,17 +495,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief other) { if (other == emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance()) return this; - if (other.getDLPIFFMADHI() != 0) { - setDLPIFFMADHI(other.getDLPIFFMADHI()); - } - if (other.getMEJOLHPJGJK() != 0) { - setMEJOLHPJGJK(other.getMEJOLHPJGJK()); - } if (other.getTowerScheduleId() != 0) { setTowerScheduleId(other.getTowerScheduleId()); } - if (other.getKCGJAFBPCLB() != 0) { - setKCGJAFBPCLB(other.getKCGJAFBPCLB()); + if (other.getTotalStarCount() != 0) { + setTotalStarCount(other.getTotalStarCount()); + } + if (other.getBestLevelIndex() != 0) { + setBestLevelIndex(other.getBestLevelIndex()); + } + if (other.getBestFloorIndex() != 0) { + setBestFloorIndex(other.getBestFloorIndex()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -544,126 +536,126 @@ public Builder mergeFrom( return this; } - private int dLPIFFMADHI_ ; + private int towerScheduleId_ ; /** - * uint32 DLPIFFMADHI = 13; - * @return The dLPIFFMADHI. + * uint32 tower_schedule_id = 5; + * @return The towerScheduleId. */ @java.lang.Override - public int getDLPIFFMADHI() { - return dLPIFFMADHI_; + public int getTowerScheduleId() { + return towerScheduleId_; } /** - * uint32 DLPIFFMADHI = 13; - * @param value The dLPIFFMADHI to set. + * uint32 tower_schedule_id = 5; + * @param value The towerScheduleId to set. * @return This builder for chaining. */ - public Builder setDLPIFFMADHI(int value) { + public Builder setTowerScheduleId(int value) { - dLPIFFMADHI_ = value; + towerScheduleId_ = value; onChanged(); return this; } /** - * uint32 DLPIFFMADHI = 13; + * uint32 tower_schedule_id = 5; * @return This builder for chaining. */ - public Builder clearDLPIFFMADHI() { + public Builder clearTowerScheduleId() { - dLPIFFMADHI_ = 0; + towerScheduleId_ = 0; onChanged(); return this; } - private int mEJOLHPJGJK_ ; + private int totalStarCount_ ; /** - * uint32 MEJOLHPJGJK = 5; - * @return The mEJOLHPJGJK. + * uint32 total_star_count = 10; + * @return The totalStarCount. */ @java.lang.Override - public int getMEJOLHPJGJK() { - return mEJOLHPJGJK_; + public int getTotalStarCount() { + return totalStarCount_; } /** - * uint32 MEJOLHPJGJK = 5; - * @param value The mEJOLHPJGJK to set. + * uint32 total_star_count = 10; + * @param value The totalStarCount to set. * @return This builder for chaining. */ - public Builder setMEJOLHPJGJK(int value) { + public Builder setTotalStarCount(int value) { - mEJOLHPJGJK_ = value; + totalStarCount_ = value; onChanged(); return this; } /** - * uint32 MEJOLHPJGJK = 5; + * uint32 total_star_count = 10; * @return This builder for chaining. */ - public Builder clearMEJOLHPJGJK() { + public Builder clearTotalStarCount() { - mEJOLHPJGJK_ = 0; + totalStarCount_ = 0; onChanged(); return this; } - private int towerScheduleId_ ; + private int bestLevelIndex_ ; /** - * uint32 tower_schedule_id = 6; - * @return The towerScheduleId. + * uint32 best_level_index = 11; + * @return The bestLevelIndex. */ @java.lang.Override - public int getTowerScheduleId() { - return towerScheduleId_; + public int getBestLevelIndex() { + return bestLevelIndex_; } /** - * uint32 tower_schedule_id = 6; - * @param value The towerScheduleId to set. + * uint32 best_level_index = 11; + * @param value The bestLevelIndex to set. * @return This builder for chaining. */ - public Builder setTowerScheduleId(int value) { + public Builder setBestLevelIndex(int value) { - towerScheduleId_ = value; + bestLevelIndex_ = value; onChanged(); return this; } /** - * uint32 tower_schedule_id = 6; + * uint32 best_level_index = 11; * @return This builder for chaining. */ - public Builder clearTowerScheduleId() { + public Builder clearBestLevelIndex() { - towerScheduleId_ = 0; + bestLevelIndex_ = 0; onChanged(); return this; } - private int kCGJAFBPCLB_ ; + private int bestFloorIndex_ ; /** - * uint32 KCGJAFBPCLB = 2; - * @return The kCGJAFBPCLB. + * uint32 best_floor_index = 15; + * @return The bestFloorIndex. */ @java.lang.Override - public int getKCGJAFBPCLB() { - return kCGJAFBPCLB_; + public int getBestFloorIndex() { + return bestFloorIndex_; } /** - * uint32 KCGJAFBPCLB = 2; - * @param value The kCGJAFBPCLB to set. + * uint32 best_floor_index = 15; + * @param value The bestFloorIndex to set. * @return This builder for chaining. */ - public Builder setKCGJAFBPCLB(int value) { + public Builder setBestFloorIndex(int value) { - kCGJAFBPCLB_ = value; + bestFloorIndex_ = value; onChanged(); return this; } /** - * uint32 KCGJAFBPCLB = 2; + * uint32 best_floor_index = 15; * @return This builder for chaining. */ - public Builder clearKCGJAFBPCLB() { + public Builder clearBestFloorIndex() { - kCGJAFBPCLB_ = 0; + bestFloorIndex_ = 0; onChanged(); return this; } @@ -734,11 +726,11 @@ public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief g descriptor; static { java.lang.String[] descriptorData = { - "\n\027TowerMonthlyBrief.proto\"m\n\021TowerMonthl" + - "yBrief\022\023\n\013DLPIFFMADHI\030\r \001(\r\022\023\n\013MEJOLHPJG" + - "JK\030\005 \001(\r\022\031\n\021tower_schedule_id\030\006 \001(\r\022\023\n\013K" + - "CGJAFBPCLB\030\002 \001(\rB\033\n\031emu.grasscutter.net." + - "protob\006proto3" + "\n\027TowerMonthlyBrief.proto\"|\n\021TowerMonthl" + + "yBrief\022\031\n\021tower_schedule_id\030\005 \001(\r\022\030\n\020tot" + + "al_star_count\030\n \001(\r\022\030\n\020best_level_index\030" + + "\013 \001(\r\022\030\n\020best_floor_index\030\017 \001(\rB\033\n\031emu.g" + + "rasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -749,7 +741,7 @@ public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief g internal_static_TowerMonthlyBrief_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerMonthlyBrief_descriptor, - new java.lang.String[] { "DLPIFFMADHI", "MEJOLHPJGJK", "TowerScheduleId", "KCGJAFBPCLB", }); + new java.lang.String[] { "TowerScheduleId", "TotalStarCount", "BestLevelIndex", "BestFloorIndex", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyCombatRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyCombatRecordOuterClass.java index 8b10b918529..e1cab53a727 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyCombatRecordOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyCombatRecordOuterClass.java @@ -19,109 +19,105 @@ public interface TowerMonthlyCombatRecordOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .TowerFightRecordPair AEMLKAIEELH = 14; - * @return Whether the aEMLKAIEELH field is set. + * .TowerFightRecordPair MFHLCAPDNMM = 2; + * @return Whether the mFHLCAPDNMM field is set. */ - boolean hasAEMLKAIEELH(); + boolean hasMFHLCAPDNMM(); /** - * .TowerFightRecordPair AEMLKAIEELH = 14; - * @return The aEMLKAIEELH. + * .TowerFightRecordPair MFHLCAPDNMM = 2; + * @return The mFHLCAPDNMM. */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getAEMLKAIEELH(); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMFHLCAPDNMM(); /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getAEMLKAIEELHOrBuilder(); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMFHLCAPDNMMOrBuilder(); /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; - * @return Whether the oBPLLGJLKHF field is set. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - boolean hasOBPLLGJLKHF(); - /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; - * @return The oBPLLGJLKHF. - */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getOBPLLGJLKHF(); + java.util.List + getMostRevealAvatarListList(); /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getOBPLLGJLKHFOrBuilder(); - + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMostRevealAvatarList(int index); /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; - * @return Whether the lDEOAIPGDJC field is set. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - boolean hasLDEOAIPGDJC(); + int getMostRevealAvatarListCount(); /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; - * @return The lDEOAIPGDJC. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getLDEOAIPGDJC(); + java.util.List + getMostRevealAvatarListOrBuilderList(); /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getLDEOAIPGDJCOrBuilder(); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMostRevealAvatarListOrBuilder( + int index); /** - * .TowerFightRecordPair HNFPAAPAABN = 4; - * @return Whether the hNFPAAPAABN field is set. + * .TowerFightRecordPair GJBDHBDJGED = 8; + * @return Whether the gJBDHBDJGED field is set. */ - boolean hasHNFPAAPAABN(); + boolean hasGJBDHBDJGED(); /** - * .TowerFightRecordPair HNFPAAPAABN = 4; - * @return The hNFPAAPAABN. + * .TowerFightRecordPair GJBDHBDJGED = 8; + * @return The gJBDHBDJGED. */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getHNFPAAPAABN(); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getGJBDHBDJGED(); /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair GJBDHBDJGED = 8; */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getHNFPAAPAABNOrBuilder(); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getGJBDHBDJGEDOrBuilder(); /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; + * @return Whether the dFGIOFHBIBL field is set. */ - java.util.List - getMostRevealAvatarListList(); + boolean hasDFGIOFHBIBL(); /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; + * @return The dFGIOFHBIBL. */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMostRevealAvatarList(int index); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getDFGIOFHBIBL(); /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; */ - int getMostRevealAvatarListCount(); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getDFGIOFHBIBLOrBuilder(); + /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; + * @return Whether the hOPJKPLBDJI field is set. */ - java.util.List - getMostRevealAvatarListOrBuilderList(); + boolean hasHOPJKPLBDJI(); /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; + * @return The hOPJKPLBDJI. */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMostRevealAvatarListOrBuilder( - int index); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getHOPJKPLBDJI(); + /** + * .TowerFightRecordPair HOPJKPLBDJI = 12; + */ + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getHOPJKPLBDJIOrBuilder(); /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; - * @return Whether the lJPMFHNJBDD field is set. + * .TowerFightRecordPair IPFOLMOJDIE = 15; + * @return Whether the iPFOLMOJDIE field is set. */ - boolean hasLJPMFHNJBDD(); + boolean hasIPFOLMOJDIE(); /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; - * @return The lJPMFHNJBDD. + * .TowerFightRecordPair IPFOLMOJDIE = 15; + * @return The iPFOLMOJDIE. */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getLJPMFHNJBDD(); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getIPFOLMOJDIE(); /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getLJPMFHNJBDDOrBuilder(); + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getIPFOLMOJDIEOrBuilder(); } /** - * 
-   * Obf: EMBGICANBKA
-   *
- * * Protobuf type {@code TowerMonthlyCombatRecord} */ public static final class TowerMonthlyCombatRecord extends @@ -170,74 +166,74 @@ private TowerMonthlyCombatRecord( break; case 18: { emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder subBuilder = null; - if (oBPLLGJLKHF_ != null) { - subBuilder = oBPLLGJLKHF_.toBuilder(); + if (mFHLCAPDNMM_ != null) { + subBuilder = mFHLCAPDNMM_.toBuilder(); } - oBPLLGJLKHF_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); + mFHLCAPDNMM_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(oBPLLGJLKHF_); - oBPLLGJLKHF_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(mFHLCAPDNMM_); + mFHLCAPDNMM_ = subBuilder.buildPartial(); } break; } case 34: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + mostRevealAvatarList_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + mostRevealAvatarList_.add( + input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry)); + break; + } + case 66: { emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder subBuilder = null; - if (hNFPAAPAABN_ != null) { - subBuilder = hNFPAAPAABN_.toBuilder(); + if (gJBDHBDJGED_ != null) { + subBuilder = gJBDHBDJGED_.toBuilder(); } - hNFPAAPAABN_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); + gJBDHBDJGED_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(hNFPAAPAABN_); - hNFPAAPAABN_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(gJBDHBDJGED_); + gJBDHBDJGED_ = subBuilder.buildPartial(); } break; } case 82: { emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder subBuilder = null; - if (lJPMFHNJBDD_ != null) { - subBuilder = lJPMFHNJBDD_.toBuilder(); + if (dFGIOFHBIBL_ != null) { + subBuilder = dFGIOFHBIBL_.toBuilder(); } - lJPMFHNJBDD_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); + dFGIOFHBIBL_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(lJPMFHNJBDD_); - lJPMFHNJBDD_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(dFGIOFHBIBL_); + dFGIOFHBIBL_ = subBuilder.buildPartial(); } break; } - case 90: { - if (!((mutable_bitField0_ & 0x00000001) != 0)) { - mostRevealAvatarList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - mostRevealAvatarList_.add( - input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry)); - break; - } case 98: { emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder subBuilder = null; - if (lDEOAIPGDJC_ != null) { - subBuilder = lDEOAIPGDJC_.toBuilder(); + if (hOPJKPLBDJI_ != null) { + subBuilder = hOPJKPLBDJI_.toBuilder(); } - lDEOAIPGDJC_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); + hOPJKPLBDJI_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(lDEOAIPGDJC_); - lDEOAIPGDJC_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(hOPJKPLBDJI_); + hOPJKPLBDJI_ = subBuilder.buildPartial(); } break; } - case 114: { + case 122: { emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder subBuilder = null; - if (aEMLKAIEELH_ != null) { - subBuilder = aEMLKAIEELH_.toBuilder(); + if (iPFOLMOJDIE_ != null) { + subBuilder = iPFOLMOJDIE_.toBuilder(); } - aEMLKAIEELH_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); + iPFOLMOJDIE_ = input.readMessage(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(aEMLKAIEELH_); - aEMLKAIEELH_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(iPFOLMOJDIE_); + iPFOLMOJDIE_ = subBuilder.buildPartial(); } break; @@ -277,174 +273,174 @@ private TowerMonthlyCombatRecord( emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.class, emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.Builder.class); } - public static final int AEMLKAIEELH_FIELD_NUMBER = 14; - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair aEMLKAIEELH_; + public static final int MFHLCAPDNMM_FIELD_NUMBER = 2; + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair mFHLCAPDNMM_; /** - * .TowerFightRecordPair AEMLKAIEELH = 14; - * @return Whether the aEMLKAIEELH field is set. + * .TowerFightRecordPair MFHLCAPDNMM = 2; + * @return Whether the mFHLCAPDNMM field is set. */ @java.lang.Override - public boolean hasAEMLKAIEELH() { - return aEMLKAIEELH_ != null; + public boolean hasMFHLCAPDNMM() { + return mFHLCAPDNMM_ != null; } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; - * @return The aEMLKAIEELH. + * .TowerFightRecordPair MFHLCAPDNMM = 2; + * @return The mFHLCAPDNMM. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getAEMLKAIEELH() { - return aEMLKAIEELH_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : aEMLKAIEELH_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMFHLCAPDNMM() { + return mFHLCAPDNMM_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : mFHLCAPDNMM_; } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getAEMLKAIEELHOrBuilder() { - return getAEMLKAIEELH(); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMFHLCAPDNMMOrBuilder() { + return getMFHLCAPDNMM(); } - public static final int OBPLLGJLKHF_FIELD_NUMBER = 2; - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair oBPLLGJLKHF_; + public static final int MOST_REVEAL_AVATAR_LIST_FIELD_NUMBER = 4; + private java.util.List mostRevealAvatarList_; /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; - * @return Whether the oBPLLGJLKHF field is set. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ @java.lang.Override - public boolean hasOBPLLGJLKHF() { - return oBPLLGJLKHF_ != null; + public java.util.List getMostRevealAvatarListList() { + return mostRevealAvatarList_; } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; - * @return The oBPLLGJLKHF. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getOBPLLGJLKHF() { - return oBPLLGJLKHF_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : oBPLLGJLKHF_; + public java.util.List + getMostRevealAvatarListOrBuilderList() { + return mostRevealAvatarList_; } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getOBPLLGJLKHFOrBuilder() { - return getOBPLLGJLKHF(); + public int getMostRevealAvatarListCount() { + return mostRevealAvatarList_.size(); } - - public static final int LDEOAIPGDJC_FIELD_NUMBER = 12; - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair lDEOAIPGDJC_; /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; - * @return Whether the lDEOAIPGDJC field is set. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ @java.lang.Override - public boolean hasLDEOAIPGDJC() { - return lDEOAIPGDJC_ != null; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMostRevealAvatarList(int index) { + return mostRevealAvatarList_.get(index); } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; - * @return The lDEOAIPGDJC. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getLDEOAIPGDJC() { - return lDEOAIPGDJC_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : lDEOAIPGDJC_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMostRevealAvatarListOrBuilder( + int index) { + return mostRevealAvatarList_.get(index); } + + public static final int GJBDHBDJGED_FIELD_NUMBER = 8; + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair gJBDHBDJGED_; /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * .TowerFightRecordPair GJBDHBDJGED = 8; + * @return Whether the gJBDHBDJGED field is set. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getLDEOAIPGDJCOrBuilder() { - return getLDEOAIPGDJC(); + public boolean hasGJBDHBDJGED() { + return gJBDHBDJGED_ != null; } - - public static final int HNFPAAPAABN_FIELD_NUMBER = 4; - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair hNFPAAPAABN_; /** - * .TowerFightRecordPair HNFPAAPAABN = 4; - * @return Whether the hNFPAAPAABN field is set. + * .TowerFightRecordPair GJBDHBDJGED = 8; + * @return The gJBDHBDJGED. */ @java.lang.Override - public boolean hasHNFPAAPAABN() { - return hNFPAAPAABN_ != null; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getGJBDHBDJGED() { + return gJBDHBDJGED_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : gJBDHBDJGED_; } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; - * @return The hNFPAAPAABN. + * .TowerFightRecordPair GJBDHBDJGED = 8; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getHNFPAAPAABN() { - return hNFPAAPAABN_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : hNFPAAPAABN_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getGJBDHBDJGEDOrBuilder() { + return getGJBDHBDJGED(); } + + public static final int DFGIOFHBIBL_FIELD_NUMBER = 10; + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair dFGIOFHBIBL_; /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair DFGIOFHBIBL = 10; + * @return Whether the dFGIOFHBIBL field is set. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getHNFPAAPAABNOrBuilder() { - return getHNFPAAPAABN(); + public boolean hasDFGIOFHBIBL() { + return dFGIOFHBIBL_ != null; } - - public static final int MOST_REVEAL_AVATAR_LIST_FIELD_NUMBER = 11; - private java.util.List mostRevealAvatarList_; /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; + * @return The dFGIOFHBIBL. */ @java.lang.Override - public java.util.List getMostRevealAvatarListList() { - return mostRevealAvatarList_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getDFGIOFHBIBL() { + return dFGIOFHBIBL_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : dFGIOFHBIBL_; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; */ @java.lang.Override - public java.util.List - getMostRevealAvatarListOrBuilderList() { - return mostRevealAvatarList_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getDFGIOFHBIBLOrBuilder() { + return getDFGIOFHBIBL(); } + + public static final int HOPJKPLBDJI_FIELD_NUMBER = 12; + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair hOPJKPLBDJI_; /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; + * @return Whether the hOPJKPLBDJI field is set. */ @java.lang.Override - public int getMostRevealAvatarListCount() { - return mostRevealAvatarList_.size(); + public boolean hasHOPJKPLBDJI() { + return hOPJKPLBDJI_ != null; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; + * @return The hOPJKPLBDJI. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMostRevealAvatarList(int index) { - return mostRevealAvatarList_.get(index); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getHOPJKPLBDJI() { + return hOPJKPLBDJI_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : hOPJKPLBDJI_; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMostRevealAvatarListOrBuilder( - int index) { - return mostRevealAvatarList_.get(index); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getHOPJKPLBDJIOrBuilder() { + return getHOPJKPLBDJI(); } - public static final int LJPMFHNJBDD_FIELD_NUMBER = 10; - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair lJPMFHNJBDD_; + public static final int IPFOLMOJDIE_FIELD_NUMBER = 15; + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair iPFOLMOJDIE_; /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; - * @return Whether the lJPMFHNJBDD field is set. + * .TowerFightRecordPair IPFOLMOJDIE = 15; + * @return Whether the iPFOLMOJDIE field is set. */ @java.lang.Override - public boolean hasLJPMFHNJBDD() { - return lJPMFHNJBDD_ != null; + public boolean hasIPFOLMOJDIE() { + return iPFOLMOJDIE_ != null; } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; - * @return The lJPMFHNJBDD. + * .TowerFightRecordPair IPFOLMOJDIE = 15; + * @return The iPFOLMOJDIE. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getLJPMFHNJBDD() { - return lJPMFHNJBDD_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : lJPMFHNJBDD_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getIPFOLMOJDIE() { + return iPFOLMOJDIE_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : iPFOLMOJDIE_; } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getLJPMFHNJBDDOrBuilder() { - return getLJPMFHNJBDD(); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getIPFOLMOJDIEOrBuilder() { + return getIPFOLMOJDIE(); } private byte memoizedIsInitialized = -1; @@ -461,23 +457,23 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (oBPLLGJLKHF_ != null) { - output.writeMessage(2, getOBPLLGJLKHF()); + if (mFHLCAPDNMM_ != null) { + output.writeMessage(2, getMFHLCAPDNMM()); } - if (hNFPAAPAABN_ != null) { - output.writeMessage(4, getHNFPAAPAABN()); + for (int i = 0; i < mostRevealAvatarList_.size(); i++) { + output.writeMessage(4, mostRevealAvatarList_.get(i)); } - if (lJPMFHNJBDD_ != null) { - output.writeMessage(10, getLJPMFHNJBDD()); + if (gJBDHBDJGED_ != null) { + output.writeMessage(8, getGJBDHBDJGED()); } - for (int i = 0; i < mostRevealAvatarList_.size(); i++) { - output.writeMessage(11, mostRevealAvatarList_.get(i)); + if (dFGIOFHBIBL_ != null) { + output.writeMessage(10, getDFGIOFHBIBL()); } - if (lDEOAIPGDJC_ != null) { - output.writeMessage(12, getLDEOAIPGDJC()); + if (hOPJKPLBDJI_ != null) { + output.writeMessage(12, getHOPJKPLBDJI()); } - if (aEMLKAIEELH_ != null) { - output.writeMessage(14, getAEMLKAIEELH()); + if (iPFOLMOJDIE_ != null) { + output.writeMessage(15, getIPFOLMOJDIE()); } unknownFields.writeTo(output); } @@ -488,29 +484,29 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (oBPLLGJLKHF_ != null) { + if (mFHLCAPDNMM_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, getOBPLLGJLKHF()); + .computeMessageSize(2, getMFHLCAPDNMM()); } - if (hNFPAAPAABN_ != null) { + for (int i = 0; i < mostRevealAvatarList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, getHNFPAAPAABN()); + .computeMessageSize(4, mostRevealAvatarList_.get(i)); } - if (lJPMFHNJBDD_ != null) { + if (gJBDHBDJGED_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, getLJPMFHNJBDD()); + .computeMessageSize(8, getGJBDHBDJGED()); } - for (int i = 0; i < mostRevealAvatarList_.size(); i++) { + if (dFGIOFHBIBL_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, mostRevealAvatarList_.get(i)); + .computeMessageSize(10, getDFGIOFHBIBL()); } - if (lDEOAIPGDJC_ != null) { + if (hOPJKPLBDJI_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, getLDEOAIPGDJC()); + .computeMessageSize(12, getHOPJKPLBDJI()); } - if (aEMLKAIEELH_ != null) { + if (iPFOLMOJDIE_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, getAEMLKAIEELH()); + .computeMessageSize(15, getIPFOLMOJDIE()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -527,32 +523,32 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord other = (emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord) obj; - if (hasAEMLKAIEELH() != other.hasAEMLKAIEELH()) return false; - if (hasAEMLKAIEELH()) { - if (!getAEMLKAIEELH() - .equals(other.getAEMLKAIEELH())) return false; - } - if (hasOBPLLGJLKHF() != other.hasOBPLLGJLKHF()) return false; - if (hasOBPLLGJLKHF()) { - if (!getOBPLLGJLKHF() - .equals(other.getOBPLLGJLKHF())) return false; - } - if (hasLDEOAIPGDJC() != other.hasLDEOAIPGDJC()) return false; - if (hasLDEOAIPGDJC()) { - if (!getLDEOAIPGDJC() - .equals(other.getLDEOAIPGDJC())) return false; - } - if (hasHNFPAAPAABN() != other.hasHNFPAAPAABN()) return false; - if (hasHNFPAAPAABN()) { - if (!getHNFPAAPAABN() - .equals(other.getHNFPAAPAABN())) return false; + if (hasMFHLCAPDNMM() != other.hasMFHLCAPDNMM()) return false; + if (hasMFHLCAPDNMM()) { + if (!getMFHLCAPDNMM() + .equals(other.getMFHLCAPDNMM())) return false; } if (!getMostRevealAvatarListList() .equals(other.getMostRevealAvatarListList())) return false; - if (hasLJPMFHNJBDD() != other.hasLJPMFHNJBDD()) return false; - if (hasLJPMFHNJBDD()) { - if (!getLJPMFHNJBDD() - .equals(other.getLJPMFHNJBDD())) return false; + if (hasGJBDHBDJGED() != other.hasGJBDHBDJGED()) return false; + if (hasGJBDHBDJGED()) { + if (!getGJBDHBDJGED() + .equals(other.getGJBDHBDJGED())) return false; + } + if (hasDFGIOFHBIBL() != other.hasDFGIOFHBIBL()) return false; + if (hasDFGIOFHBIBL()) { + if (!getDFGIOFHBIBL() + .equals(other.getDFGIOFHBIBL())) return false; + } + if (hasHOPJKPLBDJI() != other.hasHOPJKPLBDJI()) return false; + if (hasHOPJKPLBDJI()) { + if (!getHOPJKPLBDJI() + .equals(other.getHOPJKPLBDJI())) return false; + } + if (hasIPFOLMOJDIE() != other.hasIPFOLMOJDIE()) return false; + if (hasIPFOLMOJDIE()) { + if (!getIPFOLMOJDIE() + .equals(other.getIPFOLMOJDIE())) return false; } if (!unknownFields.equals(other.unknownFields)) return false; return true; @@ -565,29 +561,29 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasAEMLKAIEELH()) { - hash = (37 * hash) + AEMLKAIEELH_FIELD_NUMBER; - hash = (53 * hash) + getAEMLKAIEELH().hashCode(); - } - if (hasOBPLLGJLKHF()) { - hash = (37 * hash) + OBPLLGJLKHF_FIELD_NUMBER; - hash = (53 * hash) + getOBPLLGJLKHF().hashCode(); - } - if (hasLDEOAIPGDJC()) { - hash = (37 * hash) + LDEOAIPGDJC_FIELD_NUMBER; - hash = (53 * hash) + getLDEOAIPGDJC().hashCode(); - } - if (hasHNFPAAPAABN()) { - hash = (37 * hash) + HNFPAAPAABN_FIELD_NUMBER; - hash = (53 * hash) + getHNFPAAPAABN().hashCode(); + if (hasMFHLCAPDNMM()) { + hash = (37 * hash) + MFHLCAPDNMM_FIELD_NUMBER; + hash = (53 * hash) + getMFHLCAPDNMM().hashCode(); } if (getMostRevealAvatarListCount() > 0) { hash = (37 * hash) + MOST_REVEAL_AVATAR_LIST_FIELD_NUMBER; hash = (53 * hash) + getMostRevealAvatarListList().hashCode(); } - if (hasLJPMFHNJBDD()) { - hash = (37 * hash) + LJPMFHNJBDD_FIELD_NUMBER; - hash = (53 * hash) + getLJPMFHNJBDD().hashCode(); + if (hasGJBDHBDJGED()) { + hash = (37 * hash) + GJBDHBDJGED_FIELD_NUMBER; + hash = (53 * hash) + getGJBDHBDJGED().hashCode(); + } + if (hasDFGIOFHBIBL()) { + hash = (37 * hash) + DFGIOFHBIBL_FIELD_NUMBER; + hash = (53 * hash) + getDFGIOFHBIBL().hashCode(); + } + if (hasHOPJKPLBDJI()) { + hash = (37 * hash) + HOPJKPLBDJI_FIELD_NUMBER; + hash = (53 * hash) + getHOPJKPLBDJI().hashCode(); + } + if (hasIPFOLMOJDIE()) { + hash = (37 * hash) + IPFOLMOJDIE_FIELD_NUMBER; + hash = (53 * hash) + getIPFOLMOJDIE().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -685,10 +681,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: EMBGICANBKA
-     *
- * * Protobuf type {@code TowerMonthlyCombatRecord} */ public static final class Builder extends @@ -727,41 +719,41 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (aEMLKAIEELHBuilder_ == null) { - aEMLKAIEELH_ = null; + if (mFHLCAPDNMMBuilder_ == null) { + mFHLCAPDNMM_ = null; } else { - aEMLKAIEELH_ = null; - aEMLKAIEELHBuilder_ = null; + mFHLCAPDNMM_ = null; + mFHLCAPDNMMBuilder_ = null; } - if (oBPLLGJLKHFBuilder_ == null) { - oBPLLGJLKHF_ = null; + if (mostRevealAvatarListBuilder_ == null) { + mostRevealAvatarList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); } else { - oBPLLGJLKHF_ = null; - oBPLLGJLKHFBuilder_ = null; + mostRevealAvatarListBuilder_.clear(); } - if (lDEOAIPGDJCBuilder_ == null) { - lDEOAIPGDJC_ = null; + if (gJBDHBDJGEDBuilder_ == null) { + gJBDHBDJGED_ = null; } else { - lDEOAIPGDJC_ = null; - lDEOAIPGDJCBuilder_ = null; + gJBDHBDJGED_ = null; + gJBDHBDJGEDBuilder_ = null; } - if (hNFPAAPAABNBuilder_ == null) { - hNFPAAPAABN_ = null; + if (dFGIOFHBIBLBuilder_ == null) { + dFGIOFHBIBL_ = null; } else { - hNFPAAPAABN_ = null; - hNFPAAPAABNBuilder_ = null; + dFGIOFHBIBL_ = null; + dFGIOFHBIBLBuilder_ = null; } - if (mostRevealAvatarListBuilder_ == null) { - mostRevealAvatarList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + if (hOPJKPLBDJIBuilder_ == null) { + hOPJKPLBDJI_ = null; } else { - mostRevealAvatarListBuilder_.clear(); + hOPJKPLBDJI_ = null; + hOPJKPLBDJIBuilder_ = null; } - if (lJPMFHNJBDDBuilder_ == null) { - lJPMFHNJBDD_ = null; + if (iPFOLMOJDIEBuilder_ == null) { + iPFOLMOJDIE_ = null; } else { - lJPMFHNJBDD_ = null; - lJPMFHNJBDDBuilder_ = null; + iPFOLMOJDIE_ = null; + iPFOLMOJDIEBuilder_ = null; } return this; } @@ -790,25 +782,10 @@ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthly public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord buildPartial() { emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord result = new emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord(this); int from_bitField0_ = bitField0_; - if (aEMLKAIEELHBuilder_ == null) { - result.aEMLKAIEELH_ = aEMLKAIEELH_; - } else { - result.aEMLKAIEELH_ = aEMLKAIEELHBuilder_.build(); - } - if (oBPLLGJLKHFBuilder_ == null) { - result.oBPLLGJLKHF_ = oBPLLGJLKHF_; + if (mFHLCAPDNMMBuilder_ == null) { + result.mFHLCAPDNMM_ = mFHLCAPDNMM_; } else { - result.oBPLLGJLKHF_ = oBPLLGJLKHFBuilder_.build(); - } - if (lDEOAIPGDJCBuilder_ == null) { - result.lDEOAIPGDJC_ = lDEOAIPGDJC_; - } else { - result.lDEOAIPGDJC_ = lDEOAIPGDJCBuilder_.build(); - } - if (hNFPAAPAABNBuilder_ == null) { - result.hNFPAAPAABN_ = hNFPAAPAABN_; - } else { - result.hNFPAAPAABN_ = hNFPAAPAABNBuilder_.build(); + result.mFHLCAPDNMM_ = mFHLCAPDNMMBuilder_.build(); } if (mostRevealAvatarListBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { @@ -819,10 +796,25 @@ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthly } else { result.mostRevealAvatarList_ = mostRevealAvatarListBuilder_.build(); } - if (lJPMFHNJBDDBuilder_ == null) { - result.lJPMFHNJBDD_ = lJPMFHNJBDD_; + if (gJBDHBDJGEDBuilder_ == null) { + result.gJBDHBDJGED_ = gJBDHBDJGED_; + } else { + result.gJBDHBDJGED_ = gJBDHBDJGEDBuilder_.build(); + } + if (dFGIOFHBIBLBuilder_ == null) { + result.dFGIOFHBIBL_ = dFGIOFHBIBL_; + } else { + result.dFGIOFHBIBL_ = dFGIOFHBIBLBuilder_.build(); + } + if (hOPJKPLBDJIBuilder_ == null) { + result.hOPJKPLBDJI_ = hOPJKPLBDJI_; + } else { + result.hOPJKPLBDJI_ = hOPJKPLBDJIBuilder_.build(); + } + if (iPFOLMOJDIEBuilder_ == null) { + result.iPFOLMOJDIE_ = iPFOLMOJDIE_; } else { - result.lJPMFHNJBDD_ = lJPMFHNJBDDBuilder_.build(); + result.iPFOLMOJDIE_ = iPFOLMOJDIEBuilder_.build(); } onBuilt(); return result; @@ -872,17 +864,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord other) { if (other == emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.getDefaultInstance()) return this; - if (other.hasAEMLKAIEELH()) { - mergeAEMLKAIEELH(other.getAEMLKAIEELH()); - } - if (other.hasOBPLLGJLKHF()) { - mergeOBPLLGJLKHF(other.getOBPLLGJLKHF()); - } - if (other.hasLDEOAIPGDJC()) { - mergeLDEOAIPGDJC(other.getLDEOAIPGDJC()); - } - if (other.hasHNFPAAPAABN()) { - mergeHNFPAAPAABN(other.getHNFPAAPAABN()); + if (other.hasMFHLCAPDNMM()) { + mergeMFHLCAPDNMM(other.getMFHLCAPDNMM()); } if (mostRevealAvatarListBuilder_ == null) { if (!other.mostRevealAvatarList_.isEmpty()) { @@ -910,8 +893,17 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuter } } } - if (other.hasLJPMFHNJBDD()) { - mergeLJPMFHNJBDD(other.getLJPMFHNJBDD()); + if (other.hasGJBDHBDJGED()) { + mergeGJBDHBDJGED(other.getGJBDHBDJGED()); + } + if (other.hasDFGIOFHBIBL()) { + mergeDFGIOFHBIBL(other.getDFGIOFHBIBL()); + } + if (other.hasHOPJKPLBDJI()) { + mergeHOPJKPLBDJI(other.getHOPJKPLBDJI()); + } + if (other.hasIPFOLMOJDIE()) { + mergeIPFOLMOJDIE(other.getIPFOLMOJDIE()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -943,839 +935,839 @@ public Builder mergeFrom( } private int bitField0_; - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair aEMLKAIEELH_; + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair mFHLCAPDNMM_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> aEMLKAIEELHBuilder_; + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> mFHLCAPDNMMBuilder_; /** - * .TowerFightRecordPair AEMLKAIEELH = 14; - * @return Whether the aEMLKAIEELH field is set. + * .TowerFightRecordPair MFHLCAPDNMM = 2; + * @return Whether the mFHLCAPDNMM field is set. */ - public boolean hasAEMLKAIEELH() { - return aEMLKAIEELHBuilder_ != null || aEMLKAIEELH_ != null; + public boolean hasMFHLCAPDNMM() { + return mFHLCAPDNMMBuilder_ != null || mFHLCAPDNMM_ != null; } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; - * @return The aEMLKAIEELH. + * .TowerFightRecordPair MFHLCAPDNMM = 2; + * @return The mFHLCAPDNMM. */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getAEMLKAIEELH() { - if (aEMLKAIEELHBuilder_ == null) { - return aEMLKAIEELH_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : aEMLKAIEELH_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMFHLCAPDNMM() { + if (mFHLCAPDNMMBuilder_ == null) { + return mFHLCAPDNMM_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : mFHLCAPDNMM_; } else { - return aEMLKAIEELHBuilder_.getMessage(); + return mFHLCAPDNMMBuilder_.getMessage(); } } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ - public Builder setAEMLKAIEELH(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (aEMLKAIEELHBuilder_ == null) { + public Builder setMFHLCAPDNMM(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (mFHLCAPDNMMBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - aEMLKAIEELH_ = value; + mFHLCAPDNMM_ = value; onChanged(); } else { - aEMLKAIEELHBuilder_.setMessage(value); + mFHLCAPDNMMBuilder_.setMessage(value); } return this; } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ - public Builder setAEMLKAIEELH( + public Builder setMFHLCAPDNMM( emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { - if (aEMLKAIEELHBuilder_ == null) { - aEMLKAIEELH_ = builderForValue.build(); + if (mFHLCAPDNMMBuilder_ == null) { + mFHLCAPDNMM_ = builderForValue.build(); onChanged(); } else { - aEMLKAIEELHBuilder_.setMessage(builderForValue.build()); + mFHLCAPDNMMBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ - public Builder mergeAEMLKAIEELH(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (aEMLKAIEELHBuilder_ == null) { - if (aEMLKAIEELH_ != null) { - aEMLKAIEELH_ = - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(aEMLKAIEELH_).mergeFrom(value).buildPartial(); + public Builder mergeMFHLCAPDNMM(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (mFHLCAPDNMMBuilder_ == null) { + if (mFHLCAPDNMM_ != null) { + mFHLCAPDNMM_ = + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(mFHLCAPDNMM_).mergeFrom(value).buildPartial(); } else { - aEMLKAIEELH_ = value; + mFHLCAPDNMM_ = value; } onChanged(); } else { - aEMLKAIEELHBuilder_.mergeFrom(value); + mFHLCAPDNMMBuilder_.mergeFrom(value); } return this; } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ - public Builder clearAEMLKAIEELH() { - if (aEMLKAIEELHBuilder_ == null) { - aEMLKAIEELH_ = null; + public Builder clearMFHLCAPDNMM() { + if (mFHLCAPDNMMBuilder_ == null) { + mFHLCAPDNMM_ = null; onChanged(); } else { - aEMLKAIEELH_ = null; - aEMLKAIEELHBuilder_ = null; + mFHLCAPDNMM_ = null; + mFHLCAPDNMMBuilder_ = null; } return this; } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getAEMLKAIEELHBuilder() { + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getMFHLCAPDNMMBuilder() { onChanged(); - return getAEMLKAIEELHFieldBuilder().getBuilder(); + return getMFHLCAPDNMMFieldBuilder().getBuilder(); } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getAEMLKAIEELHOrBuilder() { - if (aEMLKAIEELHBuilder_ != null) { - return aEMLKAIEELHBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMFHLCAPDNMMOrBuilder() { + if (mFHLCAPDNMMBuilder_ != null) { + return mFHLCAPDNMMBuilder_.getMessageOrBuilder(); } else { - return aEMLKAIEELH_ == null ? - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : aEMLKAIEELH_; + return mFHLCAPDNMM_ == null ? + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : mFHLCAPDNMM_; } } /** - * .TowerFightRecordPair AEMLKAIEELH = 14; + * .TowerFightRecordPair MFHLCAPDNMM = 2; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> - getAEMLKAIEELHFieldBuilder() { - if (aEMLKAIEELHBuilder_ == null) { - aEMLKAIEELHBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getMFHLCAPDNMMFieldBuilder() { + if (mFHLCAPDNMMBuilder_ == null) { + mFHLCAPDNMMBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder>( - getAEMLKAIEELH(), + getMFHLCAPDNMM(), getParentForChildren(), isClean()); - aEMLKAIEELH_ = null; + mFHLCAPDNMM_ = null; } - return aEMLKAIEELHBuilder_; + return mFHLCAPDNMMBuilder_; } - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair oBPLLGJLKHF_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> oBPLLGJLKHFBuilder_; + private java.util.List mostRevealAvatarList_ = + java.util.Collections.emptyList(); + private void ensureMostRevealAvatarListIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + mostRevealAvatarList_ = new java.util.ArrayList(mostRevealAvatarList_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> mostRevealAvatarListBuilder_; + /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; - * @return Whether the oBPLLGJLKHF field is set. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public boolean hasOBPLLGJLKHF() { - return oBPLLGJLKHFBuilder_ != null || oBPLLGJLKHF_ != null; + public java.util.List getMostRevealAvatarListList() { + if (mostRevealAvatarListBuilder_ == null) { + return java.util.Collections.unmodifiableList(mostRevealAvatarList_); + } else { + return mostRevealAvatarListBuilder_.getMessageList(); + } } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; - * @return The oBPLLGJLKHF. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getOBPLLGJLKHF() { - if (oBPLLGJLKHFBuilder_ == null) { - return oBPLLGJLKHF_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : oBPLLGJLKHF_; + public int getMostRevealAvatarListCount() { + if (mostRevealAvatarListBuilder_ == null) { + return mostRevealAvatarList_.size(); + } else { + return mostRevealAvatarListBuilder_.getCount(); + } + } + /** + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; + */ + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMostRevealAvatarList(int index) { + if (mostRevealAvatarListBuilder_ == null) { + return mostRevealAvatarList_.get(index); } else { - return oBPLLGJLKHFBuilder_.getMessage(); + return mostRevealAvatarListBuilder_.getMessage(index); } } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public Builder setOBPLLGJLKHF(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (oBPLLGJLKHFBuilder_ == null) { + public Builder setMostRevealAvatarList( + int index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (mostRevealAvatarListBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - oBPLLGJLKHF_ = value; + ensureMostRevealAvatarListIsMutable(); + mostRevealAvatarList_.set(index, value); onChanged(); } else { - oBPLLGJLKHFBuilder_.setMessage(value); + mostRevealAvatarListBuilder_.setMessage(index, value); } - return this; } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public Builder setOBPLLGJLKHF( - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { - if (oBPLLGJLKHFBuilder_ == null) { - oBPLLGJLKHF_ = builderForValue.build(); + public Builder setMostRevealAvatarList( + int index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { + if (mostRevealAvatarListBuilder_ == null) { + ensureMostRevealAvatarListIsMutable(); + mostRevealAvatarList_.set(index, builderForValue.build()); onChanged(); } else { - oBPLLGJLKHFBuilder_.setMessage(builderForValue.build()); + mostRevealAvatarListBuilder_.setMessage(index, builderForValue.build()); } - return this; } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public Builder mergeOBPLLGJLKHF(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (oBPLLGJLKHFBuilder_ == null) { - if (oBPLLGJLKHF_ != null) { - oBPLLGJLKHF_ = - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(oBPLLGJLKHF_).mergeFrom(value).buildPartial(); - } else { - oBPLLGJLKHF_ = value; + public Builder addMostRevealAvatarList(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (mostRevealAvatarListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); } + ensureMostRevealAvatarListIsMutable(); + mostRevealAvatarList_.add(value); onChanged(); } else { - oBPLLGJLKHFBuilder_.mergeFrom(value); + mostRevealAvatarListBuilder_.addMessage(value); } - return this; } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public Builder clearOBPLLGJLKHF() { - if (oBPLLGJLKHFBuilder_ == null) { - oBPLLGJLKHF_ = null; + public Builder addMostRevealAvatarList( + int index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (mostRevealAvatarListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMostRevealAvatarListIsMutable(); + mostRevealAvatarList_.add(index, value); onChanged(); } else { - oBPLLGJLKHF_ = null; - oBPLLGJLKHFBuilder_ = null; + mostRevealAvatarListBuilder_.addMessage(index, value); } - return this; } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; - */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getOBPLLGJLKHFBuilder() { - - onChanged(); - return getOBPLLGJLKHFFieldBuilder().getBuilder(); - } - /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getOBPLLGJLKHFOrBuilder() { - if (oBPLLGJLKHFBuilder_ != null) { - return oBPLLGJLKHFBuilder_.getMessageOrBuilder(); + public Builder addMostRevealAvatarList( + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { + if (mostRevealAvatarListBuilder_ == null) { + ensureMostRevealAvatarListIsMutable(); + mostRevealAvatarList_.add(builderForValue.build()); + onChanged(); } else { - return oBPLLGJLKHF_ == null ? - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : oBPLLGJLKHF_; + mostRevealAvatarListBuilder_.addMessage(builderForValue.build()); } + return this; } /** - * .TowerFightRecordPair OBPLLGJLKHF = 2; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> - getOBPLLGJLKHFFieldBuilder() { - if (oBPLLGJLKHFBuilder_ == null) { - oBPLLGJLKHFBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder>( - getOBPLLGJLKHF(), - getParentForChildren(), - isClean()); - oBPLLGJLKHF_ = null; + public Builder addMostRevealAvatarList( + int index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { + if (mostRevealAvatarListBuilder_ == null) { + ensureMostRevealAvatarListIsMutable(); + mostRevealAvatarList_.add(index, builderForValue.build()); + onChanged(); + } else { + mostRevealAvatarListBuilder_.addMessage(index, builderForValue.build()); } - return oBPLLGJLKHFBuilder_; - } - - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair lDEOAIPGDJC_; - private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> lDEOAIPGDJCBuilder_; - /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; - * @return Whether the lDEOAIPGDJC field is set. - */ - public boolean hasLDEOAIPGDJC() { - return lDEOAIPGDJCBuilder_ != null || lDEOAIPGDJC_ != null; + return this; } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; - * @return The lDEOAIPGDJC. + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getLDEOAIPGDJC() { - if (lDEOAIPGDJCBuilder_ == null) { - return lDEOAIPGDJC_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : lDEOAIPGDJC_; + public Builder addAllMostRevealAvatarList( + java.lang.Iterable values) { + if (mostRevealAvatarListBuilder_ == null) { + ensureMostRevealAvatarListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, mostRevealAvatarList_); + onChanged(); } else { - return lDEOAIPGDJCBuilder_.getMessage(); + mostRevealAvatarListBuilder_.addAllMessages(values); } + return this; } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public Builder setLDEOAIPGDJC(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (lDEOAIPGDJCBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - lDEOAIPGDJC_ = value; + public Builder clearMostRevealAvatarList() { + if (mostRevealAvatarListBuilder_ == null) { + mostRevealAvatarList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - lDEOAIPGDJCBuilder_.setMessage(value); + mostRevealAvatarListBuilder_.clear(); } - return this; } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public Builder setLDEOAIPGDJC( - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { - if (lDEOAIPGDJCBuilder_ == null) { - lDEOAIPGDJC_ = builderForValue.build(); + public Builder removeMostRevealAvatarList(int index) { + if (mostRevealAvatarListBuilder_ == null) { + ensureMostRevealAvatarListIsMutable(); + mostRevealAvatarList_.remove(index); onChanged(); } else { - lDEOAIPGDJCBuilder_.setMessage(builderForValue.build()); + mostRevealAvatarListBuilder_.remove(index); } - return this; } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public Builder mergeLDEOAIPGDJC(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (lDEOAIPGDJCBuilder_ == null) { - if (lDEOAIPGDJC_ != null) { - lDEOAIPGDJC_ = - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(lDEOAIPGDJC_).mergeFrom(value).buildPartial(); - } else { - lDEOAIPGDJC_ = value; - } - onChanged(); - } else { - lDEOAIPGDJCBuilder_.mergeFrom(value); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getMostRevealAvatarListBuilder( + int index) { + return getMostRevealAvatarListFieldBuilder().getBuilder(index); + } + /** + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; + */ + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMostRevealAvatarListOrBuilder( + int index) { + if (mostRevealAvatarListBuilder_ == null) { + return mostRevealAvatarList_.get(index); } else { + return mostRevealAvatarListBuilder_.getMessageOrBuilder(index); } - - return this; } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public Builder clearLDEOAIPGDJC() { - if (lDEOAIPGDJCBuilder_ == null) { - lDEOAIPGDJC_ = null; - onChanged(); + public java.util.List + getMostRevealAvatarListOrBuilderList() { + if (mostRevealAvatarListBuilder_ != null) { + return mostRevealAvatarListBuilder_.getMessageOrBuilderList(); } else { - lDEOAIPGDJC_ = null; - lDEOAIPGDJCBuilder_ = null; + return java.util.Collections.unmodifiableList(mostRevealAvatarList_); } - - return this; } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getLDEOAIPGDJCBuilder() { - - onChanged(); - return getLDEOAIPGDJCFieldBuilder().getBuilder(); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder addMostRevealAvatarListBuilder() { + return getMostRevealAvatarListFieldBuilder().addBuilder( + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance()); } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getLDEOAIPGDJCOrBuilder() { - if (lDEOAIPGDJCBuilder_ != null) { - return lDEOAIPGDJCBuilder_.getMessageOrBuilder(); - } else { - return lDEOAIPGDJC_ == null ? - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : lDEOAIPGDJC_; - } + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder addMostRevealAvatarListBuilder( + int index) { + return getMostRevealAvatarListFieldBuilder().addBuilder( + index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance()); } /** - * .TowerFightRecordPair LDEOAIPGDJC = 12; + * repeated .TowerFightRecordPair most_reveal_avatar_list = 4; */ - private com.google.protobuf.SingleFieldBuilderV3< + public java.util.List + getMostRevealAvatarListBuilderList() { + return getMostRevealAvatarListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> - getLDEOAIPGDJCFieldBuilder() { - if (lDEOAIPGDJCBuilder_ == null) { - lDEOAIPGDJCBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getMostRevealAvatarListFieldBuilder() { + if (mostRevealAvatarListBuilder_ == null) { + mostRevealAvatarListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder>( - getLDEOAIPGDJC(), + mostRevealAvatarList_, + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - lDEOAIPGDJC_ = null; + mostRevealAvatarList_ = null; } - return lDEOAIPGDJCBuilder_; + return mostRevealAvatarListBuilder_; } - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair hNFPAAPAABN_; + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair gJBDHBDJGED_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> hNFPAAPAABNBuilder_; + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> gJBDHBDJGEDBuilder_; /** - * .TowerFightRecordPair HNFPAAPAABN = 4; - * @return Whether the hNFPAAPAABN field is set. + * .TowerFightRecordPair GJBDHBDJGED = 8; + * @return Whether the gJBDHBDJGED field is set. */ - public boolean hasHNFPAAPAABN() { - return hNFPAAPAABNBuilder_ != null || hNFPAAPAABN_ != null; + public boolean hasGJBDHBDJGED() { + return gJBDHBDJGEDBuilder_ != null || gJBDHBDJGED_ != null; } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; - * @return The hNFPAAPAABN. + * .TowerFightRecordPair GJBDHBDJGED = 8; + * @return The gJBDHBDJGED. */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getHNFPAAPAABN() { - if (hNFPAAPAABNBuilder_ == null) { - return hNFPAAPAABN_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : hNFPAAPAABN_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getGJBDHBDJGED() { + if (gJBDHBDJGEDBuilder_ == null) { + return gJBDHBDJGED_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : gJBDHBDJGED_; } else { - return hNFPAAPAABNBuilder_.getMessage(); + return gJBDHBDJGEDBuilder_.getMessage(); } } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair GJBDHBDJGED = 8; */ - public Builder setHNFPAAPAABN(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (hNFPAAPAABNBuilder_ == null) { + public Builder setGJBDHBDJGED(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (gJBDHBDJGEDBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - hNFPAAPAABN_ = value; + gJBDHBDJGED_ = value; onChanged(); } else { - hNFPAAPAABNBuilder_.setMessage(value); + gJBDHBDJGEDBuilder_.setMessage(value); } return this; } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair GJBDHBDJGED = 8; */ - public Builder setHNFPAAPAABN( + public Builder setGJBDHBDJGED( emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { - if (hNFPAAPAABNBuilder_ == null) { - hNFPAAPAABN_ = builderForValue.build(); + if (gJBDHBDJGEDBuilder_ == null) { + gJBDHBDJGED_ = builderForValue.build(); onChanged(); } else { - hNFPAAPAABNBuilder_.setMessage(builderForValue.build()); + gJBDHBDJGEDBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair GJBDHBDJGED = 8; */ - public Builder mergeHNFPAAPAABN(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (hNFPAAPAABNBuilder_ == null) { - if (hNFPAAPAABN_ != null) { - hNFPAAPAABN_ = - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(hNFPAAPAABN_).mergeFrom(value).buildPartial(); + public Builder mergeGJBDHBDJGED(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (gJBDHBDJGEDBuilder_ == null) { + if (gJBDHBDJGED_ != null) { + gJBDHBDJGED_ = + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(gJBDHBDJGED_).mergeFrom(value).buildPartial(); } else { - hNFPAAPAABN_ = value; + gJBDHBDJGED_ = value; } onChanged(); } else { - hNFPAAPAABNBuilder_.mergeFrom(value); + gJBDHBDJGEDBuilder_.mergeFrom(value); } return this; } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair GJBDHBDJGED = 8; */ - public Builder clearHNFPAAPAABN() { - if (hNFPAAPAABNBuilder_ == null) { - hNFPAAPAABN_ = null; + public Builder clearGJBDHBDJGED() { + if (gJBDHBDJGEDBuilder_ == null) { + gJBDHBDJGED_ = null; onChanged(); } else { - hNFPAAPAABN_ = null; - hNFPAAPAABNBuilder_ = null; + gJBDHBDJGED_ = null; + gJBDHBDJGEDBuilder_ = null; } return this; } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair GJBDHBDJGED = 8; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getHNFPAAPAABNBuilder() { + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getGJBDHBDJGEDBuilder() { onChanged(); - return getHNFPAAPAABNFieldBuilder().getBuilder(); + return getGJBDHBDJGEDFieldBuilder().getBuilder(); } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair GJBDHBDJGED = 8; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getHNFPAAPAABNOrBuilder() { - if (hNFPAAPAABNBuilder_ != null) { - return hNFPAAPAABNBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getGJBDHBDJGEDOrBuilder() { + if (gJBDHBDJGEDBuilder_ != null) { + return gJBDHBDJGEDBuilder_.getMessageOrBuilder(); } else { - return hNFPAAPAABN_ == null ? - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : hNFPAAPAABN_; + return gJBDHBDJGED_ == null ? + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : gJBDHBDJGED_; } } /** - * .TowerFightRecordPair HNFPAAPAABN = 4; + * .TowerFightRecordPair GJBDHBDJGED = 8; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> - getHNFPAAPAABNFieldBuilder() { - if (hNFPAAPAABNBuilder_ == null) { - hNFPAAPAABNBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getGJBDHBDJGEDFieldBuilder() { + if (gJBDHBDJGEDBuilder_ == null) { + gJBDHBDJGEDBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder>( - getHNFPAAPAABN(), + getGJBDHBDJGED(), getParentForChildren(), isClean()); - hNFPAAPAABN_ = null; + gJBDHBDJGED_ = null; } - return hNFPAAPAABNBuilder_; + return gJBDHBDJGEDBuilder_; } - private java.util.List mostRevealAvatarList_ = - java.util.Collections.emptyList(); - private void ensureMostRevealAvatarListIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - mostRevealAvatarList_ = new java.util.ArrayList(mostRevealAvatarList_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> mostRevealAvatarListBuilder_; - - /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; - */ - public java.util.List getMostRevealAvatarListList() { - if (mostRevealAvatarListBuilder_ == null) { - return java.util.Collections.unmodifiableList(mostRevealAvatarList_); - } else { - return mostRevealAvatarListBuilder_.getMessageList(); - } - } + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair dFGIOFHBIBL_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> dFGIOFHBIBLBuilder_; /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; + * @return Whether the dFGIOFHBIBL field is set. */ - public int getMostRevealAvatarListCount() { - if (mostRevealAvatarListBuilder_ == null) { - return mostRevealAvatarList_.size(); - } else { - return mostRevealAvatarListBuilder_.getCount(); - } + public boolean hasDFGIOFHBIBL() { + return dFGIOFHBIBLBuilder_ != null || dFGIOFHBIBL_ != null; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; + * @return The dFGIOFHBIBL. */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getMostRevealAvatarList(int index) { - if (mostRevealAvatarListBuilder_ == null) { - return mostRevealAvatarList_.get(index); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getDFGIOFHBIBL() { + if (dFGIOFHBIBLBuilder_ == null) { + return dFGIOFHBIBL_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : dFGIOFHBIBL_; } else { - return mostRevealAvatarListBuilder_.getMessage(index); + return dFGIOFHBIBLBuilder_.getMessage(); } } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; */ - public Builder setMostRevealAvatarList( - int index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (mostRevealAvatarListBuilder_ == null) { + public Builder setDFGIOFHBIBL(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (dFGIOFHBIBLBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureMostRevealAvatarListIsMutable(); - mostRevealAvatarList_.set(index, value); + dFGIOFHBIBL_ = value; onChanged(); } else { - mostRevealAvatarListBuilder_.setMessage(index, value); + dFGIOFHBIBLBuilder_.setMessage(value); } + return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; */ - public Builder setMostRevealAvatarList( - int index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { - if (mostRevealAvatarListBuilder_ == null) { - ensureMostRevealAvatarListIsMutable(); - mostRevealAvatarList_.set(index, builderForValue.build()); + public Builder setDFGIOFHBIBL( + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { + if (dFGIOFHBIBLBuilder_ == null) { + dFGIOFHBIBL_ = builderForValue.build(); onChanged(); } else { - mostRevealAvatarListBuilder_.setMessage(index, builderForValue.build()); + dFGIOFHBIBLBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; */ - public Builder addMostRevealAvatarList(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (mostRevealAvatarListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); + public Builder mergeDFGIOFHBIBL(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (dFGIOFHBIBLBuilder_ == null) { + if (dFGIOFHBIBL_ != null) { + dFGIOFHBIBL_ = + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(dFGIOFHBIBL_).mergeFrom(value).buildPartial(); + } else { + dFGIOFHBIBL_ = value; } - ensureMostRevealAvatarListIsMutable(); - mostRevealAvatarList_.add(value); onChanged(); } else { - mostRevealAvatarListBuilder_.addMessage(value); + dFGIOFHBIBLBuilder_.mergeFrom(value); } + return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; */ - public Builder addMostRevealAvatarList( - int index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (mostRevealAvatarListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMostRevealAvatarListIsMutable(); - mostRevealAvatarList_.add(index, value); + public Builder clearDFGIOFHBIBL() { + if (dFGIOFHBIBLBuilder_ == null) { + dFGIOFHBIBL_ = null; onChanged(); } else { - mostRevealAvatarListBuilder_.addMessage(index, value); + dFGIOFHBIBL_ = null; + dFGIOFHBIBLBuilder_ = null; } + return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; */ - public Builder addMostRevealAvatarList( - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { - if (mostRevealAvatarListBuilder_ == null) { - ensureMostRevealAvatarListIsMutable(); - mostRevealAvatarList_.add(builderForValue.build()); - onChanged(); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getDFGIOFHBIBLBuilder() { + + onChanged(); + return getDFGIOFHBIBLFieldBuilder().getBuilder(); + } + /** + * .TowerFightRecordPair DFGIOFHBIBL = 10; + */ + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getDFGIOFHBIBLOrBuilder() { + if (dFGIOFHBIBLBuilder_ != null) { + return dFGIOFHBIBLBuilder_.getMessageOrBuilder(); } else { - mostRevealAvatarListBuilder_.addMessage(builderForValue.build()); + return dFGIOFHBIBL_ == null ? + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : dFGIOFHBIBL_; } - return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair DFGIOFHBIBL = 10; */ - public Builder addMostRevealAvatarList( - int index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { - if (mostRevealAvatarListBuilder_ == null) { - ensureMostRevealAvatarListIsMutable(); - mostRevealAvatarList_.add(index, builderForValue.build()); - onChanged(); - } else { - mostRevealAvatarListBuilder_.addMessage(index, builderForValue.build()); + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> + getDFGIOFHBIBLFieldBuilder() { + if (dFGIOFHBIBLBuilder_ == null) { + dFGIOFHBIBLBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder>( + getDFGIOFHBIBL(), + getParentForChildren(), + isClean()); + dFGIOFHBIBL_ = null; } - return this; + return dFGIOFHBIBLBuilder_; } + + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair hOPJKPLBDJI_; + private com.google.protobuf.SingleFieldBuilderV3< + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> hOPJKPLBDJIBuilder_; /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; + * @return Whether the hOPJKPLBDJI field is set. */ - public Builder addAllMostRevealAvatarList( - java.lang.Iterable values) { - if (mostRevealAvatarListBuilder_ == null) { - ensureMostRevealAvatarListIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, mostRevealAvatarList_); - onChanged(); + public boolean hasHOPJKPLBDJI() { + return hOPJKPLBDJIBuilder_ != null || hOPJKPLBDJI_ != null; + } + /** + * .TowerFightRecordPair HOPJKPLBDJI = 12; + * @return The hOPJKPLBDJI. + */ + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getHOPJKPLBDJI() { + if (hOPJKPLBDJIBuilder_ == null) { + return hOPJKPLBDJI_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : hOPJKPLBDJI_; } else { - mostRevealAvatarListBuilder_.addAllMessages(values); + return hOPJKPLBDJIBuilder_.getMessage(); } - return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; */ - public Builder clearMostRevealAvatarList() { - if (mostRevealAvatarListBuilder_ == null) { - mostRevealAvatarList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + public Builder setHOPJKPLBDJI(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (hOPJKPLBDJIBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + hOPJKPLBDJI_ = value; onChanged(); } else { - mostRevealAvatarListBuilder_.clear(); + hOPJKPLBDJIBuilder_.setMessage(value); } + return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; */ - public Builder removeMostRevealAvatarList(int index) { - if (mostRevealAvatarListBuilder_ == null) { - ensureMostRevealAvatarListIsMutable(); - mostRevealAvatarList_.remove(index); + public Builder setHOPJKPLBDJI( + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { + if (hOPJKPLBDJIBuilder_ == null) { + hOPJKPLBDJI_ = builderForValue.build(); onChanged(); } else { - mostRevealAvatarListBuilder_.remove(index); + hOPJKPLBDJIBuilder_.setMessage(builderForValue.build()); } + return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getMostRevealAvatarListBuilder( - int index) { - return getMostRevealAvatarListFieldBuilder().getBuilder(index); - } - /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; - */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getMostRevealAvatarListOrBuilder( - int index) { - if (mostRevealAvatarListBuilder_ == null) { - return mostRevealAvatarList_.get(index); } else { - return mostRevealAvatarListBuilder_.getMessageOrBuilder(index); + public Builder mergeHOPJKPLBDJI(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (hOPJKPLBDJIBuilder_ == null) { + if (hOPJKPLBDJI_ != null) { + hOPJKPLBDJI_ = + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(hOPJKPLBDJI_).mergeFrom(value).buildPartial(); + } else { + hOPJKPLBDJI_ = value; + } + onChanged(); + } else { + hOPJKPLBDJIBuilder_.mergeFrom(value); } + + return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; */ - public java.util.List - getMostRevealAvatarListOrBuilderList() { - if (mostRevealAvatarListBuilder_ != null) { - return mostRevealAvatarListBuilder_.getMessageOrBuilderList(); + public Builder clearHOPJKPLBDJI() { + if (hOPJKPLBDJIBuilder_ == null) { + hOPJKPLBDJI_ = null; + onChanged(); } else { - return java.util.Collections.unmodifiableList(mostRevealAvatarList_); + hOPJKPLBDJI_ = null; + hOPJKPLBDJIBuilder_ = null; } + + return this; } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder addMostRevealAvatarListBuilder() { - return getMostRevealAvatarListFieldBuilder().addBuilder( - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance()); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getHOPJKPLBDJIBuilder() { + + onChanged(); + return getHOPJKPLBDJIFieldBuilder().getBuilder(); } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder addMostRevealAvatarListBuilder( - int index) { - return getMostRevealAvatarListFieldBuilder().addBuilder( - index, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance()); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getHOPJKPLBDJIOrBuilder() { + if (hOPJKPLBDJIBuilder_ != null) { + return hOPJKPLBDJIBuilder_.getMessageOrBuilder(); + } else { + return hOPJKPLBDJI_ == null ? + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : hOPJKPLBDJI_; + } } /** - * repeated .TowerFightRecordPair most_reveal_avatar_list = 11; + * .TowerFightRecordPair HOPJKPLBDJI = 12; */ - public java.util.List - getMostRevealAvatarListBuilderList() { - return getMostRevealAvatarListFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< + private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> - getMostRevealAvatarListFieldBuilder() { - if (mostRevealAvatarListBuilder_ == null) { - mostRevealAvatarListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + getHOPJKPLBDJIFieldBuilder() { + if (hOPJKPLBDJIBuilder_ == null) { + hOPJKPLBDJIBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder>( - mostRevealAvatarList_, - ((bitField0_ & 0x00000001) != 0), + getHOPJKPLBDJI(), getParentForChildren(), isClean()); - mostRevealAvatarList_ = null; + hOPJKPLBDJI_ = null; } - return mostRevealAvatarListBuilder_; + return hOPJKPLBDJIBuilder_; } - private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair lJPMFHNJBDD_; + private emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair iPFOLMOJDIE_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> lJPMFHNJBDDBuilder_; + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> iPFOLMOJDIEBuilder_; /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; - * @return Whether the lJPMFHNJBDD field is set. + * .TowerFightRecordPair IPFOLMOJDIE = 15; + * @return Whether the iPFOLMOJDIE field is set. */ - public boolean hasLJPMFHNJBDD() { - return lJPMFHNJBDDBuilder_ != null || lJPMFHNJBDD_ != null; + public boolean hasIPFOLMOJDIE() { + return iPFOLMOJDIEBuilder_ != null || iPFOLMOJDIE_ != null; } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; - * @return The lJPMFHNJBDD. + * .TowerFightRecordPair IPFOLMOJDIE = 15; + * @return The iPFOLMOJDIE. */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getLJPMFHNJBDD() { - if (lJPMFHNJBDDBuilder_ == null) { - return lJPMFHNJBDD_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : lJPMFHNJBDD_; + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair getIPFOLMOJDIE() { + if (iPFOLMOJDIEBuilder_ == null) { + return iPFOLMOJDIE_ == null ? emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : iPFOLMOJDIE_; } else { - return lJPMFHNJBDDBuilder_.getMessage(); + return iPFOLMOJDIEBuilder_.getMessage(); } } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ - public Builder setLJPMFHNJBDD(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (lJPMFHNJBDDBuilder_ == null) { + public Builder setIPFOLMOJDIE(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (iPFOLMOJDIEBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - lJPMFHNJBDD_ = value; + iPFOLMOJDIE_ = value; onChanged(); } else { - lJPMFHNJBDDBuilder_.setMessage(value); + iPFOLMOJDIEBuilder_.setMessage(value); } return this; } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ - public Builder setLJPMFHNJBDD( + public Builder setIPFOLMOJDIE( emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder builderForValue) { - if (lJPMFHNJBDDBuilder_ == null) { - lJPMFHNJBDD_ = builderForValue.build(); + if (iPFOLMOJDIEBuilder_ == null) { + iPFOLMOJDIE_ = builderForValue.build(); onChanged(); } else { - lJPMFHNJBDDBuilder_.setMessage(builderForValue.build()); + iPFOLMOJDIEBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ - public Builder mergeLJPMFHNJBDD(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { - if (lJPMFHNJBDDBuilder_ == null) { - if (lJPMFHNJBDD_ != null) { - lJPMFHNJBDD_ = - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(lJPMFHNJBDD_).mergeFrom(value).buildPartial(); + public Builder mergeIPFOLMOJDIE(emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair value) { + if (iPFOLMOJDIEBuilder_ == null) { + if (iPFOLMOJDIE_ != null) { + iPFOLMOJDIE_ = + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.newBuilder(iPFOLMOJDIE_).mergeFrom(value).buildPartial(); } else { - lJPMFHNJBDD_ = value; + iPFOLMOJDIE_ = value; } onChanged(); } else { - lJPMFHNJBDDBuilder_.mergeFrom(value); + iPFOLMOJDIEBuilder_.mergeFrom(value); } return this; } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ - public Builder clearLJPMFHNJBDD() { - if (lJPMFHNJBDDBuilder_ == null) { - lJPMFHNJBDD_ = null; + public Builder clearIPFOLMOJDIE() { + if (iPFOLMOJDIEBuilder_ == null) { + iPFOLMOJDIE_ = null; onChanged(); } else { - lJPMFHNJBDD_ = null; - lJPMFHNJBDDBuilder_ = null; + iPFOLMOJDIE_ = null; + iPFOLMOJDIEBuilder_ = null; } return this; } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getLJPMFHNJBDDBuilder() { + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder getIPFOLMOJDIEBuilder() { onChanged(); - return getLJPMFHNJBDDFieldBuilder().getBuilder(); + return getIPFOLMOJDIEFieldBuilder().getBuilder(); } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ - public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getLJPMFHNJBDDOrBuilder() { - if (lJPMFHNJBDDBuilder_ != null) { - return lJPMFHNJBDDBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder getIPFOLMOJDIEOrBuilder() { + if (iPFOLMOJDIEBuilder_ != null) { + return iPFOLMOJDIEBuilder_.getMessageOrBuilder(); } else { - return lJPMFHNJBDD_ == null ? - emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : lJPMFHNJBDD_; + return iPFOLMOJDIE_ == null ? + emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.getDefaultInstance() : iPFOLMOJDIE_; } } /** - * .TowerFightRecordPair LJPMFHNJBDD = 10; + * .TowerFightRecordPair IPFOLMOJDIE = 15; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder> - getLJPMFHNJBDDFieldBuilder() { - if (lJPMFHNJBDDBuilder_ == null) { - lJPMFHNJBDDBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getIPFOLMOJDIEFieldBuilder() { + if (iPFOLMOJDIEBuilder_ == null) { + iPFOLMOJDIEBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPair.Builder, emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.TowerFightRecordPairOrBuilder>( - getLJPMFHNJBDD(), + getIPFOLMOJDIE(), getParentForChildren(), isClean()); - lJPMFHNJBDD_ = null; + iPFOLMOJDIE_ = null; } - return lJPMFHNJBDDBuilder_; + return iPFOLMOJDIEBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -1846,13 +1838,13 @@ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthly java.lang.String[] descriptorData = { "\n\036TowerMonthlyCombatRecord.proto\032\032TowerF" + "ightRecordPair.proto\"\256\002\n\030TowerMonthlyCom" + - "batRecord\022*\n\013AEMLKAIEELH\030\016 \001(\0132\025.TowerFi" + - "ghtRecordPair\022*\n\013OBPLLGJLKHF\030\002 \001(\0132\025.Tow" + - "erFightRecordPair\022*\n\013LDEOAIPGDJC\030\014 \001(\0132\025" + - ".TowerFightRecordPair\022*\n\013HNFPAAPAABN\030\004 \001" + - "(\0132\025.TowerFightRecordPair\0226\n\027most_reveal" + - "_avatar_list\030\013 \003(\0132\025.TowerFightRecordPai" + - "r\022*\n\013LJPMFHNJBDD\030\n \001(\0132\025.TowerFightRecor" + + "batRecord\022*\n\013MFHLCAPDNMM\030\002 \001(\0132\025.TowerFi" + + "ghtRecordPair\0226\n\027most_reveal_avatar_list" + + "\030\004 \003(\0132\025.TowerFightRecordPair\022*\n\013GJBDHBD" + + "JGED\030\010 \001(\0132\025.TowerFightRecordPair\022*\n\013DFG" + + "IOFHBIBL\030\n \001(\0132\025.TowerFightRecordPair\022*\n" + + "\013HOPJKPLBDJI\030\014 \001(\0132\025.TowerFightRecordPai" + + "r\022*\n\013IPFOLMOJDIE\030\017 \001(\0132\025.TowerFightRecor" + "dPairB\033\n\031emu.grasscutter.net.protob\006prot" + "o3" }; @@ -1866,7 +1858,7 @@ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthly internal_static_TowerMonthlyCombatRecord_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerMonthlyCombatRecord_descriptor, - new java.lang.String[] { "AEMLKAIEELH", "OBPLLGJLKHF", "LDEOAIPGDJC", "HNFPAAPAABN", "MostRevealAvatarList", "LJPMFHNJBDD", }); + new java.lang.String[] { "MFHLCAPDNMM", "MostRevealAvatarList", "GJBDHBDJGED", "DFGIOFHBIBL", "HOPJKPLBDJI", "IPFOLMOJDIE", }); emu.grasscutter.net.proto.TowerFightRecordPairOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyDetailOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyDetailOuterClass.java index 2331bc18e55..bc1d33875e0 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyDetailOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerMonthlyDetailOuterClass.java @@ -19,40 +19,36 @@ public interface TowerMonthlyDetailOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; - * @return Whether the lastScheduleMonthlyBrief field is set. + * .TowerMonthlyBrief monthly_brief = 1; + * @return Whether the monthlyBrief field is set. */ - boolean hasLastScheduleMonthlyBrief(); + boolean hasMonthlyBrief(); /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; - * @return The lastScheduleMonthlyBrief. + * .TowerMonthlyBrief monthly_brief = 1; + * @return The monthlyBrief. */ - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief(); + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief(); /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder(); + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder(); /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; * @return Whether the monthlyCombatRecord field is set. */ boolean hasMonthlyCombatRecord(); /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; * @return The monthlyCombatRecord. */ emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord getMonthlyCombatRecord(); /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecordOrBuilder getMonthlyCombatRecordOrBuilder(); } /** - * 
-   * Obf: BODKPJIIDPO
-   *
- * * Protobuf type {@code TowerMonthlyDetail} */ public static final class TowerMonthlyDetail extends @@ -97,20 +93,20 @@ private TowerMonthlyDetail( case 0: done = true; break; - case 26: { + case 10: { emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder subBuilder = null; - if (lastScheduleMonthlyBrief_ != null) { - subBuilder = lastScheduleMonthlyBrief_.toBuilder(); + if (monthlyBrief_ != null) { + subBuilder = monthlyBrief_.toBuilder(); } - lastScheduleMonthlyBrief_ = input.readMessage(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.parser(), extensionRegistry); + monthlyBrief_ = input.readMessage(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.parser(), extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(lastScheduleMonthlyBrief_); - lastScheduleMonthlyBrief_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(monthlyBrief_); + monthlyBrief_ = subBuilder.buildPartial(); } break; } - case 122: { + case 74: { emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.Builder subBuilder = null; if (monthlyCombatRecord_ != null) { subBuilder = monthlyCombatRecord_.toBuilder(); @@ -155,36 +151,36 @@ private TowerMonthlyDetail( emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.class, emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.Builder.class); } - public static final int LAST_SCHEDULE_MONTHLY_BRIEF_FIELD_NUMBER = 3; - private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief lastScheduleMonthlyBrief_; + public static final int MONTHLY_BRIEF_FIELD_NUMBER = 1; + private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief monthlyBrief_; /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; - * @return Whether the lastScheduleMonthlyBrief field is set. + * .TowerMonthlyBrief monthly_brief = 1; + * @return Whether the monthlyBrief field is set. */ @java.lang.Override - public boolean hasLastScheduleMonthlyBrief() { - return lastScheduleMonthlyBrief_ != null; + public boolean hasMonthlyBrief() { + return monthlyBrief_ != null; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; - * @return The lastScheduleMonthlyBrief. + * .TowerMonthlyBrief monthly_brief = 1; + * @return The monthlyBrief. */ @java.lang.Override - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief() { - return lastScheduleMonthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief() { + return monthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ @java.lang.Override - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder() { - return getLastScheduleMonthlyBrief(); + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder() { + return getMonthlyBrief(); } - public static final int MONTHLY_COMBAT_RECORD_FIELD_NUMBER = 15; + public static final int MONTHLY_COMBAT_RECORD_FIELD_NUMBER = 9; private emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord monthlyCombatRecord_; /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; * @return Whether the monthlyCombatRecord field is set. */ @java.lang.Override @@ -192,7 +188,7 @@ public boolean hasMonthlyCombatRecord() { return monthlyCombatRecord_ != null; } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; * @return The monthlyCombatRecord. */ @java.lang.Override @@ -200,7 +196,7 @@ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthly return monthlyCombatRecord_ == null ? emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.getDefaultInstance() : monthlyCombatRecord_; } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ @java.lang.Override public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecordOrBuilder getMonthlyCombatRecordOrBuilder() { @@ -221,11 +217,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (lastScheduleMonthlyBrief_ != null) { - output.writeMessage(3, getLastScheduleMonthlyBrief()); + if (monthlyBrief_ != null) { + output.writeMessage(1, getMonthlyBrief()); } if (monthlyCombatRecord_ != null) { - output.writeMessage(15, getMonthlyCombatRecord()); + output.writeMessage(9, getMonthlyCombatRecord()); } unknownFields.writeTo(output); } @@ -236,13 +232,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (lastScheduleMonthlyBrief_ != null) { + if (monthlyBrief_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getLastScheduleMonthlyBrief()); + .computeMessageSize(1, getMonthlyBrief()); } if (monthlyCombatRecord_ != null) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, getMonthlyCombatRecord()); + .computeMessageSize(9, getMonthlyCombatRecord()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -259,10 +255,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail other = (emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail) obj; - if (hasLastScheduleMonthlyBrief() != other.hasLastScheduleMonthlyBrief()) return false; - if (hasLastScheduleMonthlyBrief()) { - if (!getLastScheduleMonthlyBrief() - .equals(other.getLastScheduleMonthlyBrief())) return false; + if (hasMonthlyBrief() != other.hasMonthlyBrief()) return false; + if (hasMonthlyBrief()) { + if (!getMonthlyBrief() + .equals(other.getMonthlyBrief())) return false; } if (hasMonthlyCombatRecord() != other.hasMonthlyCombatRecord()) return false; if (hasMonthlyCombatRecord()) { @@ -280,9 +276,9 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasLastScheduleMonthlyBrief()) { - hash = (37 * hash) + LAST_SCHEDULE_MONTHLY_BRIEF_FIELD_NUMBER; - hash = (53 * hash) + getLastScheduleMonthlyBrief().hashCode(); + if (hasMonthlyBrief()) { + hash = (37 * hash) + MONTHLY_BRIEF_FIELD_NUMBER; + hash = (53 * hash) + getMonthlyBrief().hashCode(); } if (hasMonthlyCombatRecord()) { hash = (37 * hash) + MONTHLY_COMBAT_RECORD_FIELD_NUMBER; @@ -384,10 +380,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: BODKPJIIDPO
-     *
- * * Protobuf type {@code TowerMonthlyDetail} */ public static final class Builder extends @@ -425,11 +417,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - if (lastScheduleMonthlyBriefBuilder_ == null) { - lastScheduleMonthlyBrief_ = null; + if (monthlyBriefBuilder_ == null) { + monthlyBrief_ = null; } else { - lastScheduleMonthlyBrief_ = null; - lastScheduleMonthlyBriefBuilder_ = null; + monthlyBrief_ = null; + monthlyBriefBuilder_ = null; } if (monthlyCombatRecordBuilder_ == null) { monthlyCombatRecord_ = null; @@ -463,10 +455,10 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail @java.lang.Override public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail buildPartial() { emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail result = new emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail(this); - if (lastScheduleMonthlyBriefBuilder_ == null) { - result.lastScheduleMonthlyBrief_ = lastScheduleMonthlyBrief_; + if (monthlyBriefBuilder_ == null) { + result.monthlyBrief_ = monthlyBrief_; } else { - result.lastScheduleMonthlyBrief_ = lastScheduleMonthlyBriefBuilder_.build(); + result.monthlyBrief_ = monthlyBriefBuilder_.build(); } if (monthlyCombatRecordBuilder_ == null) { result.monthlyCombatRecord_ = monthlyCombatRecord_; @@ -521,8 +513,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail other) { if (other == emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.getDefaultInstance()) return this; - if (other.hasLastScheduleMonthlyBrief()) { - mergeLastScheduleMonthlyBrief(other.getLastScheduleMonthlyBrief()); + if (other.hasMonthlyBrief()) { + mergeMonthlyBrief(other.getMonthlyBrief()); } if (other.hasMonthlyCombatRecord()) { mergeMonthlyCombatRecord(other.getMonthlyCombatRecord()); @@ -556,137 +548,137 @@ public Builder mergeFrom( return this; } - private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief lastScheduleMonthlyBrief_; + private emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief monthlyBrief_; private com.google.protobuf.SingleFieldBuilderV3< - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> lastScheduleMonthlyBriefBuilder_; + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> monthlyBriefBuilder_; /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; - * @return Whether the lastScheduleMonthlyBrief field is set. + * .TowerMonthlyBrief monthly_brief = 1; + * @return Whether the monthlyBrief field is set. */ - public boolean hasLastScheduleMonthlyBrief() { - return lastScheduleMonthlyBriefBuilder_ != null || lastScheduleMonthlyBrief_ != null; + public boolean hasMonthlyBrief() { + return monthlyBriefBuilder_ != null || monthlyBrief_ != null; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; - * @return The lastScheduleMonthlyBrief. + * .TowerMonthlyBrief monthly_brief = 1; + * @return The monthlyBrief. */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getLastScheduleMonthlyBrief() { - if (lastScheduleMonthlyBriefBuilder_ == null) { - return lastScheduleMonthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief getMonthlyBrief() { + if (monthlyBriefBuilder_ == null) { + return monthlyBrief_ == null ? emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; } else { - return lastScheduleMonthlyBriefBuilder_.getMessage(); + return monthlyBriefBuilder_.getMessage(); } } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ - public Builder setLastScheduleMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { - if (lastScheduleMonthlyBriefBuilder_ == null) { + public Builder setMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { + if (monthlyBriefBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - lastScheduleMonthlyBrief_ = value; + monthlyBrief_ = value; onChanged(); } else { - lastScheduleMonthlyBriefBuilder_.setMessage(value); + monthlyBriefBuilder_.setMessage(value); } return this; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ - public Builder setLastScheduleMonthlyBrief( + public Builder setMonthlyBrief( emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder builderForValue) { - if (lastScheduleMonthlyBriefBuilder_ == null) { - lastScheduleMonthlyBrief_ = builderForValue.build(); + if (monthlyBriefBuilder_ == null) { + monthlyBrief_ = builderForValue.build(); onChanged(); } else { - lastScheduleMonthlyBriefBuilder_.setMessage(builderForValue.build()); + monthlyBriefBuilder_.setMessage(builderForValue.build()); } return this; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ - public Builder mergeLastScheduleMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { - if (lastScheduleMonthlyBriefBuilder_ == null) { - if (lastScheduleMonthlyBrief_ != null) { - lastScheduleMonthlyBrief_ = - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.newBuilder(lastScheduleMonthlyBrief_).mergeFrom(value).buildPartial(); + public Builder mergeMonthlyBrief(emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief value) { + if (monthlyBriefBuilder_ == null) { + if (monthlyBrief_ != null) { + monthlyBrief_ = + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.newBuilder(monthlyBrief_).mergeFrom(value).buildPartial(); } else { - lastScheduleMonthlyBrief_ = value; + monthlyBrief_ = value; } onChanged(); } else { - lastScheduleMonthlyBriefBuilder_.mergeFrom(value); + monthlyBriefBuilder_.mergeFrom(value); } return this; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ - public Builder clearLastScheduleMonthlyBrief() { - if (lastScheduleMonthlyBriefBuilder_ == null) { - lastScheduleMonthlyBrief_ = null; + public Builder clearMonthlyBrief() { + if (monthlyBriefBuilder_ == null) { + monthlyBrief_ = null; onChanged(); } else { - lastScheduleMonthlyBrief_ = null; - lastScheduleMonthlyBriefBuilder_ = null; + monthlyBrief_ = null; + monthlyBriefBuilder_ = null; } return this; } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder getLastScheduleMonthlyBriefBuilder() { + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder getMonthlyBriefBuilder() { onChanged(); - return getLastScheduleMonthlyBriefFieldBuilder().getBuilder(); + return getMonthlyBriefFieldBuilder().getBuilder(); } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ - public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getLastScheduleMonthlyBriefOrBuilder() { - if (lastScheduleMonthlyBriefBuilder_ != null) { - return lastScheduleMonthlyBriefBuilder_.getMessageOrBuilder(); + public emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder getMonthlyBriefOrBuilder() { + if (monthlyBriefBuilder_ != null) { + return monthlyBriefBuilder_.getMessageOrBuilder(); } else { - return lastScheduleMonthlyBrief_ == null ? - emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : lastScheduleMonthlyBrief_; + return monthlyBrief_ == null ? + emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.getDefaultInstance() : monthlyBrief_; } } /** - * .TowerMonthlyBrief last_schedule_monthly_brief = 3; + * .TowerMonthlyBrief monthly_brief = 1; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder> - getLastScheduleMonthlyBriefFieldBuilder() { - if (lastScheduleMonthlyBriefBuilder_ == null) { - lastScheduleMonthlyBriefBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + getMonthlyBriefFieldBuilder() { + if (monthlyBriefBuilder_ == null) { + monthlyBriefBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBrief.Builder, emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.TowerMonthlyBriefOrBuilder>( - getLastScheduleMonthlyBrief(), + getMonthlyBrief(), getParentForChildren(), isClean()); - lastScheduleMonthlyBrief_ = null; + monthlyBrief_ = null; } - return lastScheduleMonthlyBriefBuilder_; + return monthlyBriefBuilder_; } private emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord monthlyCombatRecord_; private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord, emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.Builder, emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecordOrBuilder> monthlyCombatRecordBuilder_; /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; * @return Whether the monthlyCombatRecord field is set. */ public boolean hasMonthlyCombatRecord() { return monthlyCombatRecordBuilder_ != null || monthlyCombatRecord_ != null; } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; * @return The monthlyCombatRecord. */ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord getMonthlyCombatRecord() { @@ -697,7 +689,7 @@ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthly } } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ public Builder setMonthlyCombatRecord(emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord value) { if (monthlyCombatRecordBuilder_ == null) { @@ -713,7 +705,7 @@ public Builder setMonthlyCombatRecord(emu.grasscutter.net.proto.TowerMonthlyComb return this; } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ public Builder setMonthlyCombatRecord( emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.Builder builderForValue) { @@ -727,7 +719,7 @@ public Builder setMonthlyCombatRecord( return this; } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ public Builder mergeMonthlyCombatRecord(emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord value) { if (monthlyCombatRecordBuilder_ == null) { @@ -745,7 +737,7 @@ public Builder mergeMonthlyCombatRecord(emu.grasscutter.net.proto.TowerMonthlyCo return this; } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ public Builder clearMonthlyCombatRecord() { if (monthlyCombatRecordBuilder_ == null) { @@ -759,7 +751,7 @@ public Builder clearMonthlyCombatRecord() { return this; } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.Builder getMonthlyCombatRecordBuilder() { @@ -767,7 +759,7 @@ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthly return getMonthlyCombatRecordFieldBuilder().getBuilder(); } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecordOrBuilder getMonthlyCombatRecordOrBuilder() { if (monthlyCombatRecordBuilder_ != null) { @@ -778,7 +770,7 @@ public emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthly } } /** - * .TowerMonthlyCombatRecord monthly_combat_record = 15; + * .TowerMonthlyCombatRecord monthly_combat_record = 9; */ private com.google.protobuf.SingleFieldBuilderV3< emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord, emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecord.Builder, emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.TowerMonthlyCombatRecordOrBuilder> @@ -862,11 +854,11 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail java.lang.String[] descriptorData = { "\n\030TowerMonthlyDetail.proto\032\027TowerMonthly" + "Brief.proto\032\036TowerMonthlyCombatRecord.pr" + - "oto\"\207\001\n\022TowerMonthlyDetail\0227\n\033last_sched" + - "ule_monthly_brief\030\003 \001(\0132\022.TowerMonthlyBr" + - "ief\0228\n\025monthly_combat_record\030\017 \001(\0132\031.Tow" + - "erMonthlyCombatRecordB\033\n\031emu.grasscutter" + - ".net.protob\006proto3" + "oto\"y\n\022TowerMonthlyDetail\022)\n\rmonthly_bri" + + "ef\030\001 \001(\0132\022.TowerMonthlyBrief\0228\n\025monthly_" + + "combat_record\030\t \001(\0132\031.TowerMonthlyCombat" + + "RecordB\033\n\031emu.grasscutter.net.protob\006pro" + + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -879,7 +871,7 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail internal_static_TowerMonthlyDetail_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerMonthlyDetail_descriptor, - new java.lang.String[] { "LastScheduleMonthlyBrief", "MonthlyCombatRecord", }); + new java.lang.String[] { "MonthlyBrief", "MonthlyCombatRecord", }); emu.grasscutter.net.proto.TowerMonthlyBriefOuterClass.getDescriptor(); emu.grasscutter.net.proto.TowerMonthlyCombatRecordOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerRecordHandbookRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerRecordHandbookRspOuterClass.java index 6fcba91a29b..091b721c10b 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerRecordHandbookRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerRecordHandbookRspOuterClass.java @@ -19,39 +19,38 @@ public interface TowerRecordHandbookRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ java.util.List getMonthlyDetailListList(); /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail getMonthlyDetailList(int index); /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ int getMonthlyDetailListCount(); /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ java.util.List getMonthlyDetailListOrBuilderList(); /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetailOrBuilder getMonthlyDetailListOrBuilder( int index); /** - * int32 retcode = 10; + * int32 retcode = 13; * @return The retcode. */ int getRetcode(); } /** * 
-   * CmdId: 27785
-   * Obf: FBOMFHOAGBM
+   * CmdId: 23004
    *
* * Protobuf type {@code TowerRecordHandbookRsp} @@ -100,7 +99,7 @@ private TowerRecordHandbookRsp( case 0: done = true; break; - case 26: { + case 50: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { monthlyDetailList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -109,7 +108,7 @@ private TowerRecordHandbookRsp( input.readMessage(emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.parser(), extensionRegistry)); break; } - case 80: { + case 104: { retcode_ = input.readInt32(); break; @@ -149,17 +148,17 @@ private TowerRecordHandbookRsp( emu.grasscutter.net.proto.TowerRecordHandbookRspOuterClass.TowerRecordHandbookRsp.class, emu.grasscutter.net.proto.TowerRecordHandbookRspOuterClass.TowerRecordHandbookRsp.Builder.class); } - public static final int MONTHLY_DETAIL_LIST_FIELD_NUMBER = 3; + public static final int MONTHLY_DETAIL_LIST_FIELD_NUMBER = 6; private java.util.List monthlyDetailList_; /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ @java.lang.Override public java.util.List getMonthlyDetailListList() { return monthlyDetailList_; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ @java.lang.Override public java.util.List @@ -167,21 +166,21 @@ public java.util.Listrepeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ @java.lang.Override public int getMonthlyDetailListCount() { return monthlyDetailList_.size(); } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail getMonthlyDetailList(int index) { return monthlyDetailList_.get(index); } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ @java.lang.Override public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetailOrBuilder getMonthlyDetailListOrBuilder( @@ -189,10 +188,10 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail return monthlyDetailList_.get(index); } - public static final int RETCODE_FIELD_NUMBER = 10; + public static final int RETCODE_FIELD_NUMBER = 13; private int retcode_; /** - * int32 retcode = 10; + * int32 retcode = 13; * @return The retcode. */ @java.lang.Override @@ -215,10 +214,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < monthlyDetailList_.size(); i++) { - output.writeMessage(3, monthlyDetailList_.get(i)); + output.writeMessage(6, monthlyDetailList_.get(i)); } if (retcode_ != 0) { - output.writeInt32(10, retcode_); + output.writeInt32(13, retcode_); } unknownFields.writeTo(output); } @@ -231,11 +230,11 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < monthlyDetailList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, monthlyDetailList_.get(i)); + .computeMessageSize(6, monthlyDetailList_.get(i)); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, retcode_); + .computeInt32Size(13, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -370,8 +369,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27785
-     * Obf: FBOMFHOAGBM
+     * CmdId: 23004
      *
* * Protobuf type {@code TowerRecordHandbookRsp} @@ -577,7 +575,7 @@ private void ensureMonthlyDetailListIsMutable() { emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail, emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.Builder, emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetailOrBuilder> monthlyDetailListBuilder_; /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public java.util.List getMonthlyDetailListList() { if (monthlyDetailListBuilder_ == null) { @@ -587,7 +585,7 @@ public java.util.Listrepeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public int getMonthlyDetailListCount() { if (monthlyDetailListBuilder_ == null) { @@ -597,7 +595,7 @@ public int getMonthlyDetailListCount() { } } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail getMonthlyDetailList(int index) { if (monthlyDetailListBuilder_ == null) { @@ -607,7 +605,7 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail } } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder setMonthlyDetailList( int index, emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail value) { @@ -624,7 +622,7 @@ public Builder setMonthlyDetailList( return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder setMonthlyDetailList( int index, emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.Builder builderForValue) { @@ -638,7 +636,7 @@ public Builder setMonthlyDetailList( return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder addMonthlyDetailList(emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail value) { if (monthlyDetailListBuilder_ == null) { @@ -654,7 +652,7 @@ public Builder addMonthlyDetailList(emu.grasscutter.net.proto.TowerMonthlyDetail return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder addMonthlyDetailList( int index, emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail value) { @@ -671,7 +669,7 @@ public Builder addMonthlyDetailList( return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder addMonthlyDetailList( emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.Builder builderForValue) { @@ -685,7 +683,7 @@ public Builder addMonthlyDetailList( return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder addMonthlyDetailList( int index, emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.Builder builderForValue) { @@ -699,7 +697,7 @@ public Builder addMonthlyDetailList( return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder addAllMonthlyDetailList( java.lang.Iterable values) { @@ -714,7 +712,7 @@ public Builder addAllMonthlyDetailList( return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder clearMonthlyDetailList() { if (monthlyDetailListBuilder_ == null) { @@ -727,7 +725,7 @@ public Builder clearMonthlyDetailList() { return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public Builder removeMonthlyDetailList(int index) { if (monthlyDetailListBuilder_ == null) { @@ -740,14 +738,14 @@ public Builder removeMonthlyDetailList(int index) { return this; } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.Builder getMonthlyDetailListBuilder( int index) { return getMonthlyDetailListFieldBuilder().getBuilder(index); } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetailOrBuilder getMonthlyDetailListOrBuilder( int index) { @@ -757,7 +755,7 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail } } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public java.util.List getMonthlyDetailListOrBuilderList() { @@ -768,14 +766,14 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail } } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.Builder addMonthlyDetailListBuilder() { return getMonthlyDetailListFieldBuilder().addBuilder( emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.getDefaultInstance()); } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.Builder addMonthlyDetailListBuilder( int index) { @@ -783,7 +781,7 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail index, emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail.getDefaultInstance()); } /** - * repeated .TowerMonthlyDetail monthly_detail_list = 3; + * repeated .TowerMonthlyDetail monthly_detail_list = 6; */ public java.util.List getMonthlyDetailListBuilderList() { @@ -806,7 +804,7 @@ public emu.grasscutter.net.proto.TowerMonthlyDetailOuterClass.TowerMonthlyDetail private int retcode_ ; /** - * int32 retcode = 10; + * int32 retcode = 13; * @return The retcode. */ @java.lang.Override @@ -814,7 +812,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 10; + * int32 retcode = 13; * @param value The retcode to set. * @return This builder for chaining. */ @@ -825,7 +823,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 10; + * int32 retcode = 13; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -903,8 +901,8 @@ public emu.grasscutter.net.proto.TowerRecordHandbookRspOuterClass.TowerRecordHan java.lang.String[] descriptorData = { "\n\034TowerRecordHandbookRsp.proto\032\030TowerMon" + "thlyDetail.proto\"[\n\026TowerRecordHandbookR" + - "sp\0220\n\023monthly_detail_list\030\003 \003(\0132\023.TowerM" + - "onthlyDetail\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.gra" + + "sp\0220\n\023monthly_detail_list\030\006 \003(\0132\023.TowerM" + + "onthlyDetail\022\017\n\007retcode\030\r \001(\005B\033\n\031emu.gra" + "sscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerTeamOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerTeamOuterClass.java index c33c191775e..076c5259608 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerTeamOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerTeamOuterClass.java @@ -19,33 +19,29 @@ public interface TowerTeamOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 tower_team_id = 5; - * @return The towerTeamId. - */ - int getTowerTeamId(); - - /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @return A list containing the avatarGuidList. */ java.util.List getAvatarGuidListList(); /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @return The count of avatarGuidList. */ int getAvatarGuidListCount(); /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @param index The index of the element to return. * @return The avatarGuidList at the given index. */ long getAvatarGuidList(int index); + + /** + * uint32 tower_team_id = 11; + * @return The towerTeamId. + */ + int getTowerTeamId(); } /** - * 
-   * Obf: NAMNJCDLHGI
-   *
- * * Protobuf type {@code TowerTeam} */ public static final class TowerTeam extends @@ -92,7 +88,7 @@ private TowerTeam( case 0: done = true; break; - case 24: { + case 64: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { avatarGuidList_ = newLongList(); mutable_bitField0_ |= 0x00000001; @@ -100,7 +96,7 @@ private TowerTeam( avatarGuidList_.addLong(input.readUInt64()); break; } - case 26: { + case 66: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { @@ -113,7 +109,7 @@ private TowerTeam( input.popLimit(limit); break; } - case 40: { + case 88: { towerTeamId_ = input.readUInt32(); break; @@ -153,21 +149,10 @@ private TowerTeam( emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.class, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder.class); } - public static final int TOWER_TEAM_ID_FIELD_NUMBER = 5; - private int towerTeamId_; - /** - * uint32 tower_team_id = 5; - * @return The towerTeamId. - */ - @java.lang.Override - public int getTowerTeamId() { - return towerTeamId_; - } - - public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 3; + public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 8; private com.google.protobuf.Internal.LongList avatarGuidList_; /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @return A list containing the avatarGuidList. */ @java.lang.Override @@ -176,14 +161,14 @@ public int getTowerTeamId() { return avatarGuidList_; } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @return The count of avatarGuidList. */ public int getAvatarGuidListCount() { return avatarGuidList_.size(); } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @param index The index of the element to return. * @return The avatarGuidList at the given index. */ @@ -192,6 +177,17 @@ public long getAvatarGuidList(int index) { } private int avatarGuidListMemoizedSerializedSize = -1; + public static final int TOWER_TEAM_ID_FIELD_NUMBER = 11; + private int towerTeamId_; + /** + * uint32 tower_team_id = 11; + * @return The towerTeamId. + */ + @java.lang.Override + public int getTowerTeamId() { + return towerTeamId_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -208,14 +204,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); if (getAvatarGuidListList().size() > 0) { - output.writeUInt32NoTag(26); + output.writeUInt32NoTag(66); output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize); } for (int i = 0; i < avatarGuidList_.size(); i++) { output.writeUInt64NoTag(avatarGuidList_.getLong(i)); } if (towerTeamId_ != 0) { - output.writeUInt32(5, towerTeamId_); + output.writeUInt32(11, towerTeamId_); } unknownFields.writeTo(output); } @@ -242,7 +238,7 @@ public int getSerializedSize() { } if (towerTeamId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, towerTeamId_); + .computeUInt32Size(11, towerTeamId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -259,10 +255,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam other = (emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam) obj; - if (getTowerTeamId() - != other.getTowerTeamId()) return false; if (!getAvatarGuidListList() .equals(other.getAvatarGuidListList())) return false; + if (getTowerTeamId() + != other.getTowerTeamId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -274,12 +270,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + TOWER_TEAM_ID_FIELD_NUMBER; - hash = (53 * hash) + getTowerTeamId(); if (getAvatarGuidListCount() > 0) { hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER; hash = (53 * hash) + getAvatarGuidListList().hashCode(); } + hash = (37 * hash) + TOWER_TEAM_ID_FIELD_NUMBER; + hash = (53 * hash) + getTowerTeamId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -376,10 +372,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: NAMNJCDLHGI
-     *
- * * Protobuf type {@code TowerTeam} */ public static final class Builder extends @@ -417,10 +409,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - towerTeamId_ = 0; - avatarGuidList_ = emptyLongList(); bitField0_ = (bitField0_ & ~0x00000001); + towerTeamId_ = 0; + return this; } @@ -448,12 +440,12 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam build() { public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam buildPartial() { emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam result = new emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam(this); int from_bitField0_ = bitField0_; - result.towerTeamId_ = towerTeamId_; if (((bitField0_ & 0x00000001) != 0)) { avatarGuidList_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } result.avatarGuidList_ = avatarGuidList_; + result.towerTeamId_ = towerTeamId_; onBuilt(); return result; } @@ -502,9 +494,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam other) { if (other == emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.getDefaultInstance()) return this; - if (other.getTowerTeamId() != 0) { - setTowerTeamId(other.getTowerTeamId()); - } if (!other.avatarGuidList_.isEmpty()) { if (avatarGuidList_.isEmpty()) { avatarGuidList_ = other.avatarGuidList_; @@ -515,6 +504,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam } onChanged(); } + if (other.getTowerTeamId() != 0) { + setTowerTeamId(other.getTowerTeamId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -545,37 +537,6 @@ public Builder mergeFrom( } private int bitField0_; - private int towerTeamId_ ; - /** - * uint32 tower_team_id = 5; - * @return The towerTeamId. - */ - @java.lang.Override - public int getTowerTeamId() { - return towerTeamId_; - } - /** - * uint32 tower_team_id = 5; - * @param value The towerTeamId to set. - * @return This builder for chaining. - */ - public Builder setTowerTeamId(int value) { - - towerTeamId_ = value; - onChanged(); - return this; - } - /** - * uint32 tower_team_id = 5; - * @return This builder for chaining. - */ - public Builder clearTowerTeamId() { - - towerTeamId_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.Internal.LongList avatarGuidList_ = emptyLongList(); private void ensureAvatarGuidListIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { @@ -584,7 +545,7 @@ private void ensureAvatarGuidListIsMutable() { } } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @return A list containing the avatarGuidList. */ public java.util.List @@ -593,14 +554,14 @@ private void ensureAvatarGuidListIsMutable() { java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_; } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @return The count of avatarGuidList. */ public int getAvatarGuidListCount() { return avatarGuidList_.size(); } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @param index The index of the element to return. * @return The avatarGuidList at the given index. */ @@ -608,7 +569,7 @@ public long getAvatarGuidList(int index) { return avatarGuidList_.getLong(index); } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @param index The index to set the value at. * @param value The avatarGuidList to set. * @return This builder for chaining. @@ -621,7 +582,7 @@ public Builder setAvatarGuidList( return this; } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @param value The avatarGuidList to add. * @return This builder for chaining. */ @@ -632,7 +593,7 @@ public Builder addAvatarGuidList(long value) { return this; } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @param values The avatarGuidList to add. * @return This builder for chaining. */ @@ -645,7 +606,7 @@ public Builder addAllAvatarGuidList( return this; } /** - * repeated uint64 avatar_guid_list = 3; + * repeated uint64 avatar_guid_list = 8; * @return This builder for chaining. */ public Builder clearAvatarGuidList() { @@ -654,6 +615,37 @@ public Builder clearAvatarGuidList() { onChanged(); return this; } + + private int towerTeamId_ ; + /** + * uint32 tower_team_id = 11; + * @return The towerTeamId. + */ + @java.lang.Override + public int getTowerTeamId() { + return towerTeamId_; + } + /** + * uint32 tower_team_id = 11; + * @param value The towerTeamId to set. + * @return This builder for chaining. + */ + public Builder setTowerTeamId(int value) { + + towerTeamId_ = value; + onChanged(); + return this; + } + /** + * uint32 tower_team_id = 11; + * @return This builder for chaining. + */ + public Builder clearTowerTeamId() { + + towerTeamId_ = 0; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -721,8 +713,8 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getDefaultInstanc descriptor; static { java.lang.String[] descriptorData = { - "\n\017TowerTeam.proto\"<\n\tTowerTeam\022\025\n\rtower_" + - "team_id\030\005 \001(\r\022\030\n\020avatar_guid_list\030\003 \003(\004B" + + "\n\017TowerTeam.proto\"<\n\tTowerTeam\022\030\n\020avatar" + + "_guid_list\030\010 \003(\004\022\025\n\rtower_team_id\030\013 \001(\rB" + "\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -734,7 +726,7 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getDefaultInstanc internal_static_TowerTeam_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_TowerTeam_descriptor, - new java.lang.String[] { "TowerTeamId", "AvatarGuidList", }); + new java.lang.String[] { "AvatarGuidList", "TowerTeamId", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerTeamSelectReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerTeamSelectReqOuterClass.java index ef6ba72e88a..98f48c49467 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TowerTeamSelectReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerTeamSelectReqOuterClass.java @@ -19,39 +19,38 @@ public interface TowerTeamSelectReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ java.util.List getTowerTeamListList(); /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getTowerTeamList(int index); /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ int getTowerTeamListCount(); /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ java.util.List getTowerTeamListOrBuilderList(); /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTowerTeamListOrBuilder( int index); /** - * uint32 floor_id = 1; + * uint32 floor_id = 9; * @return The floorId. */ int getFloorId(); } /** * 
-   * CmdId: 2100
-   * Obf: FOIIKKPGFAG
+   * CmdId: 21495
    *
* * Protobuf type {@code TowerTeamSelectReq} @@ -100,12 +99,12 @@ private TowerTeamSelectReq( case 0: done = true; break; - case 8: { + case 72: { floorId_ = input.readUInt32(); break; } - case 122: { + case 90: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { towerTeamList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -149,17 +148,17 @@ private TowerTeamSelectReq( emu.grasscutter.net.proto.TowerTeamSelectReqOuterClass.TowerTeamSelectReq.class, emu.grasscutter.net.proto.TowerTeamSelectReqOuterClass.TowerTeamSelectReq.Builder.class); } - public static final int TOWER_TEAM_LIST_FIELD_NUMBER = 15; + public static final int TOWER_TEAM_LIST_FIELD_NUMBER = 11; private java.util.List towerTeamList_; /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ @java.lang.Override public java.util.List getTowerTeamListList() { return towerTeamList_; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ @java.lang.Override public java.util.List @@ -167,21 +166,21 @@ public java.util.List g return towerTeamList_; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ @java.lang.Override public int getTowerTeamListCount() { return towerTeamList_.size(); } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getTowerTeamList(int index) { return towerTeamList_.get(index); } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ @java.lang.Override public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTowerTeamListOrBuilder( @@ -189,10 +188,10 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTower return towerTeamList_.get(index); } - public static final int FLOOR_ID_FIELD_NUMBER = 1; + public static final int FLOOR_ID_FIELD_NUMBER = 9; private int floorId_; /** - * uint32 floor_id = 1; + * uint32 floor_id = 9; * @return The floorId. */ @java.lang.Override @@ -215,10 +214,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (floorId_ != 0) { - output.writeUInt32(1, floorId_); + output.writeUInt32(9, floorId_); } for (int i = 0; i < towerTeamList_.size(); i++) { - output.writeMessage(15, towerTeamList_.get(i)); + output.writeMessage(11, towerTeamList_.get(i)); } unknownFields.writeTo(output); } @@ -231,11 +230,11 @@ public int getSerializedSize() { size = 0; if (floorId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, floorId_); + .computeUInt32Size(9, floorId_); } for (int i = 0; i < towerTeamList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, towerTeamList_.get(i)); + .computeMessageSize(11, towerTeamList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -370,8 +369,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 2100
-     * Obf: FOIIKKPGFAG
+     * CmdId: 21495
      *
* * Protobuf type {@code TowerTeamSelectReq} @@ -577,7 +575,7 @@ private void ensureTowerTeamListIsMutable() { emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder> towerTeamListBuilder_; /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public java.util.List getTowerTeamListList() { if (towerTeamListBuilder_ == null) { @@ -587,7 +585,7 @@ public java.util.List g } } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public int getTowerTeamListCount() { if (towerTeamListBuilder_ == null) { @@ -597,7 +595,7 @@ public int getTowerTeamListCount() { } } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getTowerTeamList(int index) { if (towerTeamListBuilder_ == null) { @@ -607,7 +605,7 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam getTowerTeamList( } } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder setTowerTeamList( int index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam value) { @@ -624,7 +622,7 @@ public Builder setTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder setTowerTeamList( int index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder builderForValue) { @@ -638,7 +636,7 @@ public Builder setTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder addTowerTeamList(emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam value) { if (towerTeamListBuilder_ == null) { @@ -654,7 +652,7 @@ public Builder addTowerTeamList(emu.grasscutter.net.proto.TowerTeamOuterClass.To return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder addTowerTeamList( int index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam value) { @@ -671,7 +669,7 @@ public Builder addTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder addTowerTeamList( emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder builderForValue) { @@ -685,7 +683,7 @@ public Builder addTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder addTowerTeamList( int index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder builderForValue) { @@ -699,7 +697,7 @@ public Builder addTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder addAllTowerTeamList( java.lang.Iterable values) { @@ -714,7 +712,7 @@ public Builder addAllTowerTeamList( return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder clearTowerTeamList() { if (towerTeamListBuilder_ == null) { @@ -727,7 +725,7 @@ public Builder clearTowerTeamList() { return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public Builder removeTowerTeamList(int index) { if (towerTeamListBuilder_ == null) { @@ -740,14 +738,14 @@ public Builder removeTowerTeamList(int index) { return this; } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder getTowerTeamListBuilder( int index) { return getTowerTeamListFieldBuilder().getBuilder(index); } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTowerTeamListOrBuilder( int index) { @@ -757,7 +755,7 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTower } } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public java.util.List getTowerTeamListOrBuilderList() { @@ -768,14 +766,14 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeamOrBuilder getTower } } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder addTowerTeamListBuilder() { return getTowerTeamListFieldBuilder().addBuilder( emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.getDefaultInstance()); } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder addTowerTeamListBuilder( int index) { @@ -783,7 +781,7 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder addTowerT index, emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.getDefaultInstance()); } /** - * repeated .TowerTeam tower_team_list = 15; + * repeated .TowerTeam tower_team_list = 11; */ public java.util.List getTowerTeamListBuilderList() { @@ -806,7 +804,7 @@ public emu.grasscutter.net.proto.TowerTeamOuterClass.TowerTeam.Builder addTowerT private int floorId_ ; /** - * uint32 floor_id = 1; + * uint32 floor_id = 9; * @return The floorId. */ @java.lang.Override @@ -814,7 +812,7 @@ public int getFloorId() { return floorId_; } /** - * uint32 floor_id = 1; + * uint32 floor_id = 9; * @param value The floorId to set. * @return This builder for chaining. */ @@ -825,7 +823,7 @@ public Builder setFloorId(int value) { return this; } /** - * uint32 floor_id = 1; + * uint32 floor_id = 9; * @return This builder for chaining. */ public Builder clearFloorId() { @@ -903,7 +901,7 @@ public emu.grasscutter.net.proto.TowerTeamSelectReqOuterClass.TowerTeamSelectReq java.lang.String[] descriptorData = { "\n\030TowerTeamSelectReq.proto\032\017TowerTeam.pr" + "oto\"K\n\022TowerTeamSelectReq\022#\n\017tower_team_" + - "list\030\017 \003(\0132\n.TowerTeam\022\020\n\010floor_id\030\001 \001(\r" + + "list\030\013 \003(\0132\n.TowerTeam\022\020\n\010floor_id\030\t \001(\r" + "B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarFirstPassDungeonNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarFirstPassDungeonNotifyOuterClass.java index 91ff3261cf8..0f108cd907e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarFirstPassDungeonNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarFirstPassDungeonNotifyOuterClass.java @@ -26,8 +26,8 @@ public interface TrialAvatarFirstPassDungeonNotifyOrBuilder extends } /** * 
-   * 5.0.0
-   * CmdId: 8103
+   * CmdId: 6009
+   * Obf: FMDPKNJCNHO
    *
* * Protobuf type {@code TrialAvatarFirstPassDungeonNotify} @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * 5.0.0
-     * CmdId: 8103
+     * CmdId: 6009
+     * Obf: FMDPKNJCNHO
      *
* * Protobuf type {@code TrialAvatarFirstPassDungeonNotify} diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UgcMusicNoteOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UgcMusicNoteOuterClass.java index 5aba5d46c37..0d7b4d7c718 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UgcMusicNoteOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UgcMusicNoteOuterClass.java @@ -19,20 +19,20 @@ public interface UgcMusicNoteOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 start_time = 9; - * @return The startTime. + * uint32 end_time = 2; + * @return The endTime. */ - int getStartTime(); + int getEndTime(); /** - * uint32 end_time = 15; - * @return The endTime. + * uint32 start_time = 14; + * @return The startTime. */ - int getEndTime(); + int getStartTime(); } /** * 
-   * Obf: BODJKMIGPEP
+   *obf: BCOELCKIGPG
    *
* * Protobuf type {@code UgcMusicNote} @@ -79,14 +79,14 @@ private UgcMusicNote( case 0: done = true; break; - case 72: { + case 16: { - startTime_ = input.readUInt32(); + endTime_ = input.readUInt32(); break; } - case 120: { + case 112: { - endTime_ = input.readUInt32(); + startTime_ = input.readUInt32(); break; } default: { @@ -121,26 +121,26 @@ private UgcMusicNote( emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote.class, emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote.Builder.class); } - public static final int START_TIME_FIELD_NUMBER = 9; - private int startTime_; + public static final int END_TIME_FIELD_NUMBER = 2; + private int endTime_; /** - * uint32 start_time = 9; - * @return The startTime. + * uint32 end_time = 2; + * @return The endTime. */ @java.lang.Override - public int getStartTime() { - return startTime_; + public int getEndTime() { + return endTime_; } - public static final int END_TIME_FIELD_NUMBER = 15; - private int endTime_; + public static final int START_TIME_FIELD_NUMBER = 14; + private int startTime_; /** - * uint32 end_time = 15; - * @return The endTime. + * uint32 start_time = 14; + * @return The startTime. */ @java.lang.Override - public int getEndTime() { - return endTime_; + public int getStartTime() { + return startTime_; } private byte memoizedIsInitialized = -1; @@ -157,11 +157,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (startTime_ != 0) { - output.writeUInt32(9, startTime_); - } if (endTime_ != 0) { - output.writeUInt32(15, endTime_); + output.writeUInt32(2, endTime_); + } + if (startTime_ != 0) { + output.writeUInt32(14, startTime_); } unknownFields.writeTo(output); } @@ -172,13 +172,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (startTime_ != 0) { + if (endTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(9, startTime_); + .computeUInt32Size(2, endTime_); } - if (endTime_ != 0) { + if (startTime_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(15, endTime_); + .computeUInt32Size(14, startTime_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -195,10 +195,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote other = (emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote) obj; - if (getStartTime() - != other.getStartTime()) return false; if (getEndTime() != other.getEndTime()) return false; + if (getStartTime() + != other.getStartTime()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -210,10 +210,10 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + START_TIME_FIELD_NUMBER; - hash = (53 * hash) + getStartTime(); hash = (37 * hash) + END_TIME_FIELD_NUMBER; hash = (53 * hash) + getEndTime(); + hash = (37 * hash) + START_TIME_FIELD_NUMBER; + hash = (53 * hash) + getStartTime(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -311,7 +311,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: BODJKMIGPEP
+     *obf: BCOELCKIGPG
      *
* * Protobuf type {@code UgcMusicNote} @@ -351,10 +351,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - startTime_ = 0; - endTime_ = 0; + startTime_ = 0; + return this; } @@ -381,8 +381,8 @@ public emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote build() { @java.lang.Override public emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote buildPartial() { emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote result = new emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote(this); - result.startTime_ = startTime_; result.endTime_ = endTime_; + result.startTime_ = startTime_; onBuilt(); return result; } @@ -431,12 +431,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote other) { if (other == emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote.getDefaultInstance()) return this; - if (other.getStartTime() != 0) { - setStartTime(other.getStartTime()); - } if (other.getEndTime() != 0) { setEndTime(other.getEndTime()); } + if (other.getStartTime() != 0) { + setStartTime(other.getStartTime()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -466,64 +466,64 @@ public Builder mergeFrom( return this; } - private int startTime_ ; + private int endTime_ ; /** - * uint32 start_time = 9; - * @return The startTime. + * uint32 end_time = 2; + * @return The endTime. */ @java.lang.Override - public int getStartTime() { - return startTime_; + public int getEndTime() { + return endTime_; } /** - * uint32 start_time = 9; - * @param value The startTime to set. + * uint32 end_time = 2; + * @param value The endTime to set. * @return This builder for chaining. */ - public Builder setStartTime(int value) { + public Builder setEndTime(int value) { - startTime_ = value; + endTime_ = value; onChanged(); return this; } /** - * uint32 start_time = 9; + * uint32 end_time = 2; * @return This builder for chaining. */ - public Builder clearStartTime() { + public Builder clearEndTime() { - startTime_ = 0; + endTime_ = 0; onChanged(); return this; } - private int endTime_ ; + private int startTime_ ; /** - * uint32 end_time = 15; - * @return The endTime. + * uint32 start_time = 14; + * @return The startTime. */ @java.lang.Override - public int getEndTime() { - return endTime_; + public int getStartTime() { + return startTime_; } /** - * uint32 end_time = 15; - * @param value The endTime to set. + * uint32 start_time = 14; + * @param value The startTime to set. * @return This builder for chaining. */ - public Builder setEndTime(int value) { + public Builder setStartTime(int value) { - endTime_ = value; + startTime_ = value; onChanged(); return this; } /** - * uint32 end_time = 15; + * uint32 start_time = 14; * @return This builder for chaining. */ - public Builder clearEndTime() { + public Builder clearStartTime() { - endTime_ = 0; + startTime_ = 0; onChanged(); return this; } @@ -594,8 +594,8 @@ public emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote getDefaultI descriptor; static { java.lang.String[] descriptorData = { - "\n\022UgcMusicNote.proto\"4\n\014UgcMusicNote\022\022\n\n" + - "start_time\030\t \001(\r\022\020\n\010end_time\030\017 \001(\rB\033\n\031em" + + "\n\022UgcMusicNote.proto\"4\n\014UgcMusicNote\022\020\n\010" + + "end_time\030\002 \001(\r\022\022\n\nstart_time\030\016 \001(\rB\033\n\031em" + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -607,7 +607,7 @@ public emu.grasscutter.net.proto.UgcMusicNoteOuterClass.UgcMusicNote getDefaultI internal_static_UgcMusicNote_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_UgcMusicNote_descriptor, - new java.lang.String[] { "StartTime", "EndTime", }); + new java.lang.String[] { "EndTime", "StartTime", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentReqOuterClass.java index 6c7633e5940..a1d9bae82bc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentReqOuterClass.java @@ -31,6 +31,12 @@ public interface UnlockAvatarTalentReqOrBuilder extends long getAvatarGuid(); } /** + * 
+   * CmdId: 6454
+   * obf: LBMKGDJNDAE
+   * 5.0
+   *
+ * * Protobuf type {@code UnlockAvatarTalentReq} */ public static final class UnlockAvatarTalentReq extends @@ -307,6 +313,12 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 6454
+     * obf: LBMKGDJNDAE
+     * 5.0
+     *
+ * * Protobuf type {@code UnlockAvatarTalentReq} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentRspOuterClass.java index 985296a01e3..254c8ff63c7 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentRspOuterClass.java @@ -37,6 +37,12 @@ public interface UnlockAvatarTalentRspOrBuilder extends int getTalentId(); } /** + * 
+   * CmdId: 23185
+   * obf: JCNMBKLFFFD
+   * 5.0
+   *
+ * * Protobuf type {@code UnlockAvatarTalentRsp} */ public static final class UnlockAvatarTalentRsp extends @@ -340,6 +346,12 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 23185
+     * obf: JCNMBKLFFFD
+     * 5.0
+     *
+ * * Protobuf type {@code UnlockAvatarTalentRsp} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockNameCardNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockNameCardNotifyOuterClass.java index d1498fc1048..bdcc01f2d66 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockNameCardNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockNameCardNotifyOuterClass.java @@ -19,15 +19,15 @@ public interface UnlockNameCardNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 name_card_id = 2; + * uint32 name_card_id = 3; * @return The nameCardId. */ int getNameCardId(); } /** * 
-   * CmdId: 3896
-   * Obf: JBDIJCCECHP
+   * CmdId: 20229
+   * obf: MJNMKMLLACL
    *
* * Protobuf type {@code UnlockNameCardNotify} @@ -74,7 +74,7 @@ private UnlockNameCardNotify( case 0: done = true; break; - case 16: { + case 24: { nameCardId_ = input.readUInt32(); break; @@ -111,10 +111,10 @@ private UnlockNameCardNotify( emu.grasscutter.net.proto.UnlockNameCardNotifyOuterClass.UnlockNameCardNotify.class, emu.grasscutter.net.proto.UnlockNameCardNotifyOuterClass.UnlockNameCardNotify.Builder.class); } - public static final int NAME_CARD_ID_FIELD_NUMBER = 2; + public static final int NAME_CARD_ID_FIELD_NUMBER = 3; private int nameCardId_; /** - * uint32 name_card_id = 2; + * uint32 name_card_id = 3; * @return The nameCardId. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (nameCardId_ != 0) { - output.writeUInt32(2, nameCardId_); + output.writeUInt32(3, nameCardId_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (nameCardId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, nameCardId_); + .computeUInt32Size(3, nameCardId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 3896
-     * Obf: JBDIJCCECHP
+     * CmdId: 20229
+     * obf: MJNMKMLLACL
      *
* * Protobuf type {@code UnlockNameCardNotify} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int nameCardId_ ; /** - * uint32 name_card_id = 2; + * uint32 name_card_id = 3; * @return The nameCardId. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getNameCardId() { return nameCardId_; } /** - * uint32 name_card_id = 2; + * uint32 name_card_id = 3; * @param value The nameCardId to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setNameCardId(int value) { return this; } /** - * uint32 name_card_id = 2; + * uint32 name_card_id = 3; * @return This builder for chaining. */ public Builder clearNameCardId() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.UnlockNameCardNotifyOuterClass.UnlockNameCardNo static { java.lang.String[] descriptorData = { "\n\032UnlockNameCardNotify.proto\",\n\024UnlockNa" + - "meCardNotify\022\024\n\014name_card_id\030\002 \001(\rB\033\n\031em" + + "meCardNotify\022\024\n\014name_card_id\030\003 \001(\rB\033\n\031em" + "u.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockPersonalLineReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockPersonalLineReqOuterClass.java index 0074fa8e140..45bf011af1e 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockPersonalLineReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockPersonalLineReqOuterClass.java @@ -19,15 +19,14 @@ public interface UnlockPersonalLineReqOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 personal_line_id = 12; + * uint32 personal_line_id = 1; * @return The personalLineId. */ int getPersonalLineId(); } /** * 
-   * CmdId: 1085
-   * Obf: JHKJAJEABJK
+   * CmdId: 2554
    *
* * Protobuf type {@code UnlockPersonalLineReq} @@ -74,7 +73,7 @@ private UnlockPersonalLineReq( case 0: done = true; break; - case 96: { + case 8: { personalLineId_ = input.readUInt32(); break; @@ -111,10 +110,10 @@ private UnlockPersonalLineReq( emu.grasscutter.net.proto.UnlockPersonalLineReqOuterClass.UnlockPersonalLineReq.class, emu.grasscutter.net.proto.UnlockPersonalLineReqOuterClass.UnlockPersonalLineReq.Builder.class); } - public static final int PERSONAL_LINE_ID_FIELD_NUMBER = 12; + public static final int PERSONAL_LINE_ID_FIELD_NUMBER = 1; private int personalLineId_; /** - * uint32 personal_line_id = 12; + * uint32 personal_line_id = 1; * @return The personalLineId. */ @java.lang.Override @@ -137,7 +136,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (personalLineId_ != 0) { - output.writeUInt32(12, personalLineId_); + output.writeUInt32(1, personalLineId_); } unknownFields.writeTo(output); } @@ -150,7 +149,7 @@ public int getSerializedSize() { size = 0; if (personalLineId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(12, personalLineId_); + .computeUInt32Size(1, personalLineId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +278,7 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 1085
-     * Obf: JHKJAJEABJK
+     * CmdId: 2554
      *
* * Protobuf type {@code UnlockPersonalLineReq} @@ -431,7 +429,7 @@ public Builder mergeFrom( private int personalLineId_ ; /** - * uint32 personal_line_id = 12; + * uint32 personal_line_id = 1; * @return The personalLineId. */ @java.lang.Override @@ -439,7 +437,7 @@ public int getPersonalLineId() { return personalLineId_; } /** - * uint32 personal_line_id = 12; + * uint32 personal_line_id = 1; * @param value The personalLineId to set. * @return This builder for chaining. */ @@ -450,7 +448,7 @@ public Builder setPersonalLineId(int value) { return this; } /** - * uint32 personal_line_id = 12; + * uint32 personal_line_id = 1; * @return This builder for chaining. */ public Builder clearPersonalLineId() { @@ -527,7 +525,7 @@ public emu.grasscutter.net.proto.UnlockPersonalLineReqOuterClass.UnlockPersonalL static { java.lang.String[] descriptorData = { "\n\033UnlockPersonalLineReq.proto\"1\n\025UnlockP" + - "ersonalLineReq\022\030\n\020personal_line_id\030\014 \001(\r" + + "ersonalLineReq\022\030\n\020personal_line_id\030\001 \001(\r" + "B\033\n\031emu.grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockPersonalLineRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockPersonalLineRspOuterClass.java index 4cb5d34e651..eb3b4ae2f22 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockPersonalLineRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockPersonalLineRspOuterClass.java @@ -19,45 +19,45 @@ public interface UnlockPersonalLineRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 9; + * int32 retcode = 5; * @return The retcode. */ int getRetcode(); /** - * uint32 personal_line_id = 11; + * uint32 personal_line_id = 9; * @return The personalLineId. */ int getPersonalLineId(); /** - * uint32 level = 12; - * @return Whether the level field is set. + * uint32 chapter_id = 4; + * @return Whether the chapterId field is set. */ - boolean hasLevel(); + boolean hasChapterId(); /** - * uint32 level = 12; - * @return The level. + * uint32 chapter_id = 4; + * @return The chapterId. */ - int getLevel(); + int getChapterId(); /** - * uint32 chapter_id = 7; - * @return Whether the chapterId field is set. + * uint32 level = 6; + * @return Whether the level field is set. */ - boolean hasChapterId(); + boolean hasLevel(); /** - * uint32 chapter_id = 7; - * @return The chapterId. + * uint32 level = 6; + * @return The level. */ - int getChapterId(); + int getLevel(); public emu.grasscutter.net.proto.UnlockPersonalLineRspOuterClass.UnlockPersonalLineRsp.ParamCase getParamCase(); } /** * 
-   * CmdId: 5048
-   * Obf: HPGEEFKDBJD
+   * CmdId: 24052
+   * obf: DLPKEKCNMCE
    *
* * Protobuf type {@code UnlockPersonalLineRsp} @@ -104,24 +104,24 @@ private UnlockPersonalLineRsp( case 0: done = true; break; - case 56: { - paramCase_ = 7; + case 32: { + paramCase_ = 4; param_ = input.readUInt32(); break; } - case 72: { + case 40: { retcode_ = input.readInt32(); break; } - case 88: { - - personalLineId_ = input.readUInt32(); + case 48: { + paramCase_ = 6; + param_ = input.readUInt32(); break; } - case 96: { - paramCase_ = 12; - param_ = input.readUInt32(); + case 72: { + + personalLineId_ = input.readUInt32(); break; } default: { @@ -161,8 +161,8 @@ private UnlockPersonalLineRsp( public enum ParamCase implements com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { - LEVEL(12), - CHAPTER_ID(7), + CHAPTER_ID(4), + LEVEL(6), PARAM_NOT_SET(0); private final int value; private ParamCase(int value) { @@ -180,8 +180,8 @@ public static ParamCase valueOf(int value) { public static ParamCase forNumber(int value) { switch (value) { - case 12: return LEVEL; - case 7: return CHAPTER_ID; + case 4: return CHAPTER_ID; + case 6: return LEVEL; case 0: return PARAM_NOT_SET; default: return null; } @@ -197,10 +197,10 @@ public int getNumber() { paramCase_); } - public static final int RETCODE_FIELD_NUMBER = 9; + public static final int RETCODE_FIELD_NUMBER = 5; private int retcode_; /** - * int32 retcode = 9; + * int32 retcode = 5; * @return The retcode. */ @java.lang.Override @@ -208,10 +208,10 @@ public int getRetcode() { return retcode_; } - public static final int PERSONAL_LINE_ID_FIELD_NUMBER = 11; + public static final int PERSONAL_LINE_ID_FIELD_NUMBER = 9; private int personalLineId_; /** - * uint32 personal_line_id = 11; + * uint32 personal_line_id = 9; * @return The personalLineId. */ @java.lang.Override @@ -219,43 +219,43 @@ public int getPersonalLineId() { return personalLineId_; } - public static final int LEVEL_FIELD_NUMBER = 12; + public static final int CHAPTER_ID_FIELD_NUMBER = 4; /** - * uint32 level = 12; - * @return Whether the level field is set. + * uint32 chapter_id = 4; + * @return Whether the chapterId field is set. */ @java.lang.Override - public boolean hasLevel() { - return paramCase_ == 12; + public boolean hasChapterId() { + return paramCase_ == 4; } /** - * uint32 level = 12; - * @return The level. + * uint32 chapter_id = 4; + * @return The chapterId. */ @java.lang.Override - public int getLevel() { - if (paramCase_ == 12) { + public int getChapterId() { + if (paramCase_ == 4) { return (java.lang.Integer) param_; } return 0; } - public static final int CHAPTER_ID_FIELD_NUMBER = 7; + public static final int LEVEL_FIELD_NUMBER = 6; /** - * uint32 chapter_id = 7; - * @return Whether the chapterId field is set. + * uint32 level = 6; + * @return Whether the level field is set. */ @java.lang.Override - public boolean hasChapterId() { - return paramCase_ == 7; + public boolean hasLevel() { + return paramCase_ == 6; } /** - * uint32 chapter_id = 7; - * @return The chapterId. + * uint32 level = 6; + * @return The level. */ @java.lang.Override - public int getChapterId() { - if (paramCase_ == 7) { + public int getLevel() { + if (paramCase_ == 6) { return (java.lang.Integer) param_; } return 0; @@ -275,19 +275,19 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (paramCase_ == 7) { + if (paramCase_ == 4) { output.writeUInt32( - 7, (int)((java.lang.Integer) param_)); + 4, (int)((java.lang.Integer) param_)); } if (retcode_ != 0) { - output.writeInt32(9, retcode_); - } - if (personalLineId_ != 0) { - output.writeUInt32(11, personalLineId_); + output.writeInt32(5, retcode_); } - if (paramCase_ == 12) { + if (paramCase_ == 6) { output.writeUInt32( - 12, (int)((java.lang.Integer) param_)); + 6, (int)((java.lang.Integer) param_)); + } + if (personalLineId_ != 0) { + output.writeUInt32(9, personalLineId_); } unknownFields.writeTo(output); } @@ -298,23 +298,23 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (paramCase_ == 7) { + if (paramCase_ == 4) { size += com.google.protobuf.CodedOutputStream .computeUInt32Size( - 7, (int)((java.lang.Integer) param_)); + 4, (int)((java.lang.Integer) param_)); } if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, retcode_); + .computeInt32Size(5, retcode_); } - if (personalLineId_ != 0) { + if (paramCase_ == 6) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, personalLineId_); + .computeUInt32Size( + 6, (int)((java.lang.Integer) param_)); } - if (paramCase_ == 12) { + if (personalLineId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size( - 12, (int)((java.lang.Integer) param_)); + .computeUInt32Size(9, personalLineId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -337,14 +337,14 @@ public boolean equals(final java.lang.Object obj) { != other.getPersonalLineId()) return false; if (!getParamCase().equals(other.getParamCase())) return false; switch (paramCase_) { - case 12: - if (getLevel() - != other.getLevel()) return false; - break; - case 7: + case 4: if (getChapterId() != other.getChapterId()) return false; break; + case 6: + if (getLevel() + != other.getLevel()) return false; + break; case 0: default: } @@ -364,14 +364,14 @@ public int hashCode() { hash = (37 * hash) + PERSONAL_LINE_ID_FIELD_NUMBER; hash = (53 * hash) + getPersonalLineId(); switch (paramCase_) { - case 12: - hash = (37 * hash) + LEVEL_FIELD_NUMBER; - hash = (53 * hash) + getLevel(); - break; - case 7: + case 4: hash = (37 * hash) + CHAPTER_ID_FIELD_NUMBER; hash = (53 * hash) + getChapterId(); break; + case 6: + hash = (37 * hash) + LEVEL_FIELD_NUMBER; + hash = (53 * hash) + getLevel(); + break; case 0: default: } @@ -472,8 +472,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 5048
-     * Obf: HPGEEFKDBJD
+     * CmdId: 24052
+     * obf: DLPKEKCNMCE
      *
* * Protobuf type {@code UnlockPersonalLineRsp} @@ -547,10 +547,10 @@ public emu.grasscutter.net.proto.UnlockPersonalLineRspOuterClass.UnlockPersonalL emu.grasscutter.net.proto.UnlockPersonalLineRspOuterClass.UnlockPersonalLineRsp result = new emu.grasscutter.net.proto.UnlockPersonalLineRspOuterClass.UnlockPersonalLineRsp(this); result.retcode_ = retcode_; result.personalLineId_ = personalLineId_; - if (paramCase_ == 12) { + if (paramCase_ == 4) { result.param_ = param_; } - if (paramCase_ == 7) { + if (paramCase_ == 6) { result.param_ = param_; } result.paramCase_ = paramCase_; @@ -609,14 +609,14 @@ public Builder mergeFrom(emu.grasscutter.net.proto.UnlockPersonalLineRspOuterCla setPersonalLineId(other.getPersonalLineId()); } switch (other.getParamCase()) { - case LEVEL: { - setLevel(other.getLevel()); - break; - } case CHAPTER_ID: { setChapterId(other.getChapterId()); break; } + case LEVEL: { + setLevel(other.getLevel()); + break; + } case PARAM_NOT_SET: { break; } @@ -667,7 +667,7 @@ public Builder clearParam() { private int retcode_ ; /** - * int32 retcode = 9; + * int32 retcode = 5; * @return The retcode. */ @java.lang.Override @@ -675,7 +675,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 9; + * int32 retcode = 5; * @param value The retcode to set. * @return This builder for chaining. */ @@ -686,7 +686,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 9; + * int32 retcode = 5; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -698,7 +698,7 @@ public Builder clearRetcode() { private int personalLineId_ ; /** - * uint32 personal_line_id = 11; + * uint32 personal_line_id = 9; * @return The personalLineId. */ @java.lang.Override @@ -706,7 +706,7 @@ public int getPersonalLineId() { return personalLineId_; } /** - * uint32 personal_line_id = 11; + * uint32 personal_line_id = 9; * @param value The personalLineId to set. * @return This builder for chaining. */ @@ -717,7 +717,7 @@ public Builder setPersonalLineId(int value) { return this; } /** - * uint32 personal_line_id = 11; + * uint32 personal_line_id = 9; * @return This builder for chaining. */ public Builder clearPersonalLineId() { @@ -728,39 +728,39 @@ public Builder clearPersonalLineId() { } /** - * uint32 level = 12; - * @return Whether the level field is set. + * uint32 chapter_id = 4; + * @return Whether the chapterId field is set. */ - public boolean hasLevel() { - return paramCase_ == 12; + public boolean hasChapterId() { + return paramCase_ == 4; } /** - * uint32 level = 12; - * @return The level. + * uint32 chapter_id = 4; + * @return The chapterId. */ - public int getLevel() { - if (paramCase_ == 12) { + public int getChapterId() { + if (paramCase_ == 4) { return (java.lang.Integer) param_; } return 0; } /** - * uint32 level = 12; - * @param value The level to set. + * uint32 chapter_id = 4; + * @param value The chapterId to set. * @return This builder for chaining. */ - public Builder setLevel(int value) { - paramCase_ = 12; + public Builder setChapterId(int value) { + paramCase_ = 4; param_ = value; onChanged(); return this; } /** - * uint32 level = 12; + * uint32 chapter_id = 4; * @return This builder for chaining. */ - public Builder clearLevel() { - if (paramCase_ == 12) { + public Builder clearChapterId() { + if (paramCase_ == 4) { paramCase_ = 0; param_ = null; onChanged(); @@ -769,39 +769,39 @@ public Builder clearLevel() { } /** - * uint32 chapter_id = 7; - * @return Whether the chapterId field is set. + * uint32 level = 6; + * @return Whether the level field is set. */ - public boolean hasChapterId() { - return paramCase_ == 7; + public boolean hasLevel() { + return paramCase_ == 6; } /** - * uint32 chapter_id = 7; - * @return The chapterId. + * uint32 level = 6; + * @return The level. */ - public int getChapterId() { - if (paramCase_ == 7) { + public int getLevel() { + if (paramCase_ == 6) { return (java.lang.Integer) param_; } return 0; } /** - * uint32 chapter_id = 7; - * @param value The chapterId to set. + * uint32 level = 6; + * @param value The level to set. * @return This builder for chaining. */ - public Builder setChapterId(int value) { - paramCase_ = 7; + public Builder setLevel(int value) { + paramCase_ = 6; param_ = value; onChanged(); return this; } /** - * uint32 chapter_id = 7; + * uint32 level = 6; * @return This builder for chaining. */ - public Builder clearChapterId() { - if (paramCase_ == 7) { + public Builder clearLevel() { + if (paramCase_ == 6) { paramCase_ = 0; param_ = null; onChanged(); @@ -876,9 +876,9 @@ public emu.grasscutter.net.proto.UnlockPersonalLineRspOuterClass.UnlockPersonalL static { java.lang.String[] descriptorData = { "\n\033UnlockPersonalLineRsp.proto\"r\n\025UnlockP" + - "ersonalLineRsp\022\017\n\007retcode\030\t \001(\005\022\030\n\020perso" + - "nal_line_id\030\013 \001(\r\022\017\n\005level\030\014 \001(\rH\000\022\024\n\nch" + - "apter_id\030\007 \001(\rH\000B\007\n\005paramB\033\n\031emu.grasscu" + + "ersonalLineRsp\022\017\n\007retcode\030\005 \001(\005\022\030\n\020perso" + + "nal_line_id\030\t \001(\r\022\024\n\nchapter_id\030\004 \001(\rH\000\022" + + "\017\n\005level\030\006 \001(\rH\000B\007\n\005paramB\033\n\031emu.grasscu" + "tter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -890,7 +890,7 @@ public emu.grasscutter.net.proto.UnlockPersonalLineRspOuterClass.UnlockPersonalL internal_static_UnlockPersonalLineRsp_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_UnlockPersonalLineRsp_descriptor, - new java.lang.String[] { "Retcode", "PersonalLineId", "Level", "ChapterId", "Param", }); + new java.lang.String[] { "Retcode", "PersonalLineId", "ChapterId", "Level", "Param", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointRspOuterClass.java index 24916b3f056..cfd1d6ff115 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointRspOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointRspOuterClass.java @@ -19,15 +19,15 @@ public interface UnlockTransPointRspOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * int32 retcode = 4; + * int32 retcode = 8; * @return The retcode. */ int getRetcode(); } /** * 
-   * CmdId: 21510
-   * Obf: IBGGKMKPHOB
+   * obf: GBAENIFCJBC
+   * CmdId: 23546
    *
* * Protobuf type {@code UnlockTransPointRsp} @@ -74,7 +74,7 @@ private UnlockTransPointRsp( case 0: done = true; break; - case 32: { + case 64: { retcode_ = input.readInt32(); break; @@ -111,10 +111,10 @@ private UnlockTransPointRsp( emu.grasscutter.net.proto.UnlockTransPointRspOuterClass.UnlockTransPointRsp.class, emu.grasscutter.net.proto.UnlockTransPointRspOuterClass.UnlockTransPointRsp.Builder.class); } - public static final int RETCODE_FIELD_NUMBER = 4; + public static final int RETCODE_FIELD_NUMBER = 8; private int retcode_; /** - * int32 retcode = 4; + * int32 retcode = 8; * @return The retcode. */ @java.lang.Override @@ -137,7 +137,7 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (retcode_ != 0) { - output.writeInt32(4, retcode_); + output.writeInt32(8, retcode_); } unknownFields.writeTo(output); } @@ -150,7 +150,7 @@ public int getSerializedSize() { size = 0; if (retcode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(4, retcode_); + .computeInt32Size(8, retcode_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -279,8 +279,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 21510
-     * Obf: IBGGKMKPHOB
+     * obf: GBAENIFCJBC
+     * CmdId: 23546
      *
* * Protobuf type {@code UnlockTransPointRsp} @@ -431,7 +431,7 @@ public Builder mergeFrom( private int retcode_ ; /** - * int32 retcode = 4; + * int32 retcode = 8; * @return The retcode. */ @java.lang.Override @@ -439,7 +439,7 @@ public int getRetcode() { return retcode_; } /** - * int32 retcode = 4; + * int32 retcode = 8; * @param value The retcode to set. * @return This builder for chaining. */ @@ -450,7 +450,7 @@ public Builder setRetcode(int value) { return this; } /** - * int32 retcode = 4; + * int32 retcode = 8; * @return This builder for chaining. */ public Builder clearRetcode() { @@ -527,7 +527,7 @@ public emu.grasscutter.net.proto.UnlockTransPointRspOuterClass.UnlockTransPointR static { java.lang.String[] descriptorData = { "\n\031UnlockTransPointRsp.proto\"&\n\023UnlockTra" + - "nsPointRsp\022\017\n\007retcode\030\004 \001(\005B\033\n\031emu.grass" + + "nsPointRsp\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.grass" + "cutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java index 0c80a18e4b3..c54ba0b19fd 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java @@ -66,6 +66,10 @@ emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamLis long getTargetWeaponGuid(); } /** + * 
+   * CmdId: 20908
+   *
+ * * Protobuf type {@code WeaponUpgradeReq} */ public static final class WeaponUpgradeReq extends @@ -463,6 +467,10 @@ protected Builder newBuilderForType( return builder; } /** + * 
+     * CmdId: 20908
+     *
+ * * Protobuf type {@code WeaponUpgradeReq} */ public static final class Builder extends diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownDataOuterClass.java index f64beedd71e..90a9c7662fc 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownDataOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownDataOuterClass.java @@ -19,26 +19,26 @@ public interface WidgetCoolDownDataOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 id = 1; - * @return The id. + * uint64 cool_down_time = 1; + * @return The coolDownTime. */ - int getId(); + long getCoolDownTime(); /** - * uint64 cool_down_time = 14; - * @return The coolDownTime. + * uint32 id = 4; + * @return The id. */ - long getCoolDownTime(); + int getId(); /** - * bool is_success = 2; + * bool is_success = 5; * @return The isSuccess. */ boolean getIsSuccess(); } /** * 
-   * Obf: ANGGPDIPOFF
+   * obf: PHJJCHBPKM1P
    *
* * Protobuf type {@code WidgetCoolDownData} @@ -87,17 +87,17 @@ private WidgetCoolDownData( break; case 8: { - id_ = input.readUInt32(); + coolDownTime_ = input.readUInt64(); break; } - case 16: { + case 32: { - isSuccess_ = input.readBool(); + id_ = input.readUInt32(); break; } - case 112: { + case 40: { - coolDownTime_ = input.readUInt64(); + isSuccess_ = input.readBool(); break; } default: { @@ -132,32 +132,32 @@ private WidgetCoolDownData( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.class, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder.class); } - public static final int ID_FIELD_NUMBER = 1; - private int id_; + public static final int COOL_DOWN_TIME_FIELD_NUMBER = 1; + private long coolDownTime_; /** - * uint32 id = 1; - * @return The id. + * uint64 cool_down_time = 1; + * @return The coolDownTime. */ @java.lang.Override - public int getId() { - return id_; + public long getCoolDownTime() { + return coolDownTime_; } - public static final int COOL_DOWN_TIME_FIELD_NUMBER = 14; - private long coolDownTime_; + public static final int ID_FIELD_NUMBER = 4; + private int id_; /** - * uint64 cool_down_time = 14; - * @return The coolDownTime. + * uint32 id = 4; + * @return The id. */ @java.lang.Override - public long getCoolDownTime() { - return coolDownTime_; + public int getId() { + return id_; } - public static final int IS_SUCCESS_FIELD_NUMBER = 2; + public static final int IS_SUCCESS_FIELD_NUMBER = 5; private boolean isSuccess_; /** - * bool is_success = 2; + * bool is_success = 5; * @return The isSuccess. */ @java.lang.Override @@ -179,14 +179,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (coolDownTime_ != 0L) { + output.writeUInt64(1, coolDownTime_); + } if (id_ != 0) { - output.writeUInt32(1, id_); + output.writeUInt32(4, id_); } if (isSuccess_ != false) { - output.writeBool(2, isSuccess_); - } - if (coolDownTime_ != 0L) { - output.writeUInt64(14, coolDownTime_); + output.writeBool(5, isSuccess_); } unknownFields.writeTo(output); } @@ -197,17 +197,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (id_ != 0) { + if (coolDownTime_ != 0L) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(1, id_); + .computeUInt64Size(1, coolDownTime_); } - if (isSuccess_ != false) { + if (id_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, isSuccess_); + .computeUInt32Size(4, id_); } - if (coolDownTime_ != 0L) { + if (isSuccess_ != false) { size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(14, coolDownTime_); + .computeBoolSize(5, isSuccess_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -224,10 +224,10 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData other = (emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData) obj; - if (getId() - != other.getId()) return false; if (getCoolDownTime() != other.getCoolDownTime()) return false; + if (getId() + != other.getId()) return false; if (getIsSuccess() != other.getIsSuccess()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -241,11 +241,11 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId(); hash = (37 * hash) + COOL_DOWN_TIME_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getCoolDownTime()); + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId(); hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getIsSuccess()); @@ -346,7 +346,7 @@ protected Builder newBuilderForType( } /** * 
-     * Obf: ANGGPDIPOFF
+     * obf: PHJJCHBPKM1P
      *
* * Protobuf type {@code WidgetCoolDownData} @@ -386,10 +386,10 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - id_ = 0; - coolDownTime_ = 0L; + id_ = 0; + isSuccess_ = false; return this; @@ -418,8 +418,8 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData @java.lang.Override public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData buildPartial() { emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData result = new emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData(this); - result.id_ = id_; result.coolDownTime_ = coolDownTime_; + result.id_ = id_; result.isSuccess_ = isSuccess_; onBuilt(); return result; @@ -469,12 +469,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData other) { if (other == emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()) return this; - if (other.getId() != 0) { - setId(other.getId()); - } if (other.getCoolDownTime() != 0L) { setCoolDownTime(other.getCoolDownTime()); } + if (other.getId() != 0) { + setId(other.getId()); + } if (other.getIsSuccess() != false) { setIsSuccess(other.getIsSuccess()); } @@ -507,71 +507,71 @@ public Builder mergeFrom( return this; } - private int id_ ; + private long coolDownTime_ ; /** - * uint32 id = 1; - * @return The id. + * uint64 cool_down_time = 1; + * @return The coolDownTime. */ @java.lang.Override - public int getId() { - return id_; + public long getCoolDownTime() { + return coolDownTime_; } /** - * uint32 id = 1; - * @param value The id to set. + * uint64 cool_down_time = 1; + * @param value The coolDownTime to set. * @return This builder for chaining. */ - public Builder setId(int value) { + public Builder setCoolDownTime(long value) { - id_ = value; + coolDownTime_ = value; onChanged(); return this; } /** - * uint32 id = 1; + * uint64 cool_down_time = 1; * @return This builder for chaining. */ - public Builder clearId() { + public Builder clearCoolDownTime() { - id_ = 0; + coolDownTime_ = 0L; onChanged(); return this; } - private long coolDownTime_ ; + private int id_ ; /** - * uint64 cool_down_time = 14; - * @return The coolDownTime. + * uint32 id = 4; + * @return The id. */ @java.lang.Override - public long getCoolDownTime() { - return coolDownTime_; + public int getId() { + return id_; } /** - * uint64 cool_down_time = 14; - * @param value The coolDownTime to set. + * uint32 id = 4; + * @param value The id to set. * @return This builder for chaining. */ - public Builder setCoolDownTime(long value) { + public Builder setId(int value) { - coolDownTime_ = value; + id_ = value; onChanged(); return this; } /** - * uint64 cool_down_time = 14; + * uint32 id = 4; * @return This builder for chaining. */ - public Builder clearCoolDownTime() { + public Builder clearId() { - coolDownTime_ = 0L; + id_ = 0; onChanged(); return this; } private boolean isSuccess_ ; /** - * bool is_success = 2; + * bool is_success = 5; * @return The isSuccess. */ @java.lang.Override @@ -579,7 +579,7 @@ public boolean getIsSuccess() { return isSuccess_; } /** - * bool is_success = 2; + * bool is_success = 5; * @param value The isSuccess to set. * @return This builder for chaining. */ @@ -590,7 +590,7 @@ public Builder setIsSuccess(boolean value) { return this; } /** - * bool is_success = 2; + * bool is_success = 5; * @return This builder for chaining. */ public Builder clearIsSuccess() { @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData static { java.lang.String[] descriptorData = { "\n\030WidgetCoolDownData.proto\"L\n\022WidgetCool" + - "DownData\022\n\n\002id\030\001 \001(\r\022\026\n\016cool_down_time\030\016" + - " \001(\004\022\022\n\nis_success\030\002 \001(\010B\033\n\031emu.grasscut" + + "DownData\022\026\n\016cool_down_time\030\001 \001(\004\022\n\n\002id\030\004" + + " \001(\r\022\022\n\nis_success\030\005 \001(\010B\033\n\031emu.grasscut" + "ter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData internal_static_WidgetCoolDownData_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WidgetCoolDownData_descriptor, - new java.lang.String[] { "Id", "CoolDownTime", "IsSuccess", }); + new java.lang.String[] { "CoolDownTime", "Id", "IsSuccess", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java index 4a3b419daae..6679b528e72 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCoolDownNotifyOuterClass.java @@ -19,57 +19,97 @@ public interface WidgetCoolDownNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ java.util.List getGroupCoolDownDataListList(); /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index); /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ int getGroupCoolDownDataListCount(); /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ java.util.List getGroupCoolDownDataListOrBuilderList(); /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder( int index); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ java.util.List getNormalCoolDownDataListList(); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ int getNormalCoolDownDataListCount(); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ java.util.List getNormalCoolDownDataListOrBuilderList(); /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( int index); } /** * 
-   * CmdId: 27222
-   * Obf: ANFHONAFACH
+   * CmdId: 20751
+   * obf: FILFPCHGOHH
    *
* * Protobuf type {@code WidgetCoolDownNotify} @@ -119,7 +159,7 @@ private WidgetCoolDownNotify( case 0: done = true; break; - case 58: { + case 18: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { groupCoolDownDataList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -128,7 +168,7 @@ private WidgetCoolDownNotify( input.readMessage(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.parser(), extensionRegistry)); break; } - case 82: { + case 66: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { normalCoolDownDataList_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -175,17 +215,25 @@ private WidgetCoolDownNotify( emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify.class, emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNotify.Builder.class); } - public static final int GROUP_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 7; + public static final int GROUP_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 2; private java.util.List groupCoolDownDataList_; /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ @java.lang.Override public java.util.List getGroupCoolDownDataListList() { return groupCoolDownDataList_; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ @java.lang.Override public java.util.List @@ -193,21 +241,33 @@ public java.util.Listrepeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ @java.lang.Override public int getGroupCoolDownDataListCount() { return groupCoolDownDataList_.size(); } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ @java.lang.Override public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index) { return groupCoolDownDataList_.get(index); } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+     * obf: CDEENLJNODA 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ @java.lang.Override public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder( @@ -215,17 +275,25 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData return groupCoolDownDataList_.get(index); } - public static final int NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 10; + public static final int NORMAL_COOL_DOWN_DATA_LIST_FIELD_NUMBER = 8; private java.util.List normalCoolDownDataList_; /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ @java.lang.Override public java.util.List getNormalCoolDownDataListList() { return normalCoolDownDataList_; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ @java.lang.Override public java.util.List @@ -233,21 +301,33 @@ public java.util.Listrepeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ @java.lang.Override public int getNormalCoolDownDataListCount() { return normalCoolDownDataList_.size(); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) { return normalCoolDownDataList_.get(index); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+     * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+     *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ @java.lang.Override public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( @@ -270,10 +350,10 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < groupCoolDownDataList_.size(); i++) { - output.writeMessage(7, groupCoolDownDataList_.get(i)); + output.writeMessage(2, groupCoolDownDataList_.get(i)); } for (int i = 0; i < normalCoolDownDataList_.size(); i++) { - output.writeMessage(10, normalCoolDownDataList_.get(i)); + output.writeMessage(8, normalCoolDownDataList_.get(i)); } unknownFields.writeTo(output); } @@ -286,11 +366,11 @@ public int getSerializedSize() { size = 0; for (int i = 0; i < groupCoolDownDataList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, groupCoolDownDataList_.get(i)); + .computeMessageSize(2, groupCoolDownDataList_.get(i)); } for (int i = 0; i < normalCoolDownDataList_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, normalCoolDownDataList_.get(i)); + .computeMessageSize(8, normalCoolDownDataList_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -427,8 +507,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 27222
-     * Obf: ANFHONAFACH
+     * CmdId: 20751
+     * obf: FILFPCHGOHH
      *
* * Protobuf type {@code WidgetCoolDownNotify} @@ -670,7 +750,11 @@ private void ensureGroupCoolDownDataListIsMutable() { emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> groupCoolDownDataListBuilder_; /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public java.util.List getGroupCoolDownDataListList() { if (groupCoolDownDataListBuilder_ == null) { @@ -680,7 +764,11 @@ public java.util.Listrepeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public int getGroupCoolDownDataListCount() { if (groupCoolDownDataListBuilder_ == null) { @@ -690,7 +778,11 @@ public int getGroupCoolDownDataListCount() { } } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getGroupCoolDownDataList(int index) { if (groupCoolDownDataListBuilder_ == null) { @@ -700,7 +792,11 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData } } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder setGroupCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { @@ -717,7 +813,11 @@ public Builder setGroupCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder setGroupCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { @@ -731,7 +831,11 @@ public Builder setGroupCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder addGroupCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { if (groupCoolDownDataListBuilder_ == null) { @@ -747,7 +851,11 @@ public Builder addGroupCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDown return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder addGroupCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { @@ -764,7 +872,11 @@ public Builder addGroupCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder addGroupCoolDownDataList( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { @@ -778,7 +890,11 @@ public Builder addGroupCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder addGroupCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { @@ -792,7 +908,11 @@ public Builder addGroupCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder addAllGroupCoolDownDataList( java.lang.Iterable values) { @@ -807,7 +927,11 @@ public Builder addAllGroupCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder clearGroupCoolDownDataList() { if (groupCoolDownDataListBuilder_ == null) { @@ -820,7 +944,11 @@ public Builder clearGroupCoolDownDataList() { return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public Builder removeGroupCoolDownDataList(int index) { if (groupCoolDownDataListBuilder_ == null) { @@ -833,14 +961,22 @@ public Builder removeGroupCoolDownDataList(int index) { return this; } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getGroupCoolDownDataListBuilder( int index) { return getGroupCoolDownDataListFieldBuilder().getBuilder(index); } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getGroupCoolDownDataListOrBuilder( int index) { @@ -850,7 +986,11 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData } } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public java.util.List getGroupCoolDownDataListOrBuilderList() { @@ -861,14 +1001,22 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData } } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addGroupCoolDownDataListBuilder() { return getGroupCoolDownDataListFieldBuilder().addBuilder( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()); } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addGroupCoolDownDataListBuilder( int index) { @@ -876,7 +1024,11 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()); } /** - * repeated .WidgetCoolDownData group_cool_down_data_list = 7; + * 
+       * obf: CDEENLJNODA 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData group_cool_down_data_list = 2; */ public java.util.List getGroupCoolDownDataListBuilderList() { @@ -910,7 +1062,11 @@ private void ensureNormalCoolDownDataListIsMutable() { emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder> normalCoolDownDataListBuilder_; /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public java.util.List getNormalCoolDownDataListList() { if (normalCoolDownDataListBuilder_ == null) { @@ -920,7 +1076,11 @@ public java.util.Listrepeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public int getNormalCoolDownDataListCount() { if (normalCoolDownDataListBuilder_ == null) { @@ -930,7 +1090,11 @@ public int getNormalCoolDownDataListCount() { } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData getNormalCoolDownDataList(int index) { if (normalCoolDownDataListBuilder_ == null) { @@ -940,7 +1104,11 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder setNormalCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { @@ -957,7 +1125,11 @@ public Builder setNormalCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder setNormalCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { @@ -971,7 +1143,11 @@ public Builder setNormalCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder addNormalCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { if (normalCoolDownDataListBuilder_ == null) { @@ -987,7 +1163,11 @@ public Builder addNormalCoolDownDataList(emu.grasscutter.net.proto.WidgetCoolDow return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder addNormalCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData value) { @@ -1004,7 +1184,11 @@ public Builder addNormalCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder addNormalCoolDownDataList( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { @@ -1018,7 +1202,11 @@ public Builder addNormalCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder addNormalCoolDownDataList( int index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder builderForValue) { @@ -1032,7 +1220,11 @@ public Builder addNormalCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder addAllNormalCoolDownDataList( java.lang.Iterable values) { @@ -1047,7 +1239,11 @@ public Builder addAllNormalCoolDownDataList( return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder clearNormalCoolDownDataList() { if (normalCoolDownDataListBuilder_ == null) { @@ -1060,7 +1256,11 @@ public Builder clearNormalCoolDownDataList() { return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public Builder removeNormalCoolDownDataList(int index) { if (normalCoolDownDataListBuilder_ == null) { @@ -1073,14 +1273,22 @@ public Builder removeNormalCoolDownDataList(int index) { return this; } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder getNormalCoolDownDataListBuilder( int index) { return getNormalCoolDownDataListFieldBuilder().getBuilder(index); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownDataOrBuilder getNormalCoolDownDataListOrBuilder( int index) { @@ -1090,7 +1298,11 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public java.util.List getNormalCoolDownDataListOrBuilderList() { @@ -1101,14 +1313,22 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData } } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder() { return getNormalCoolDownDataListFieldBuilder().addBuilder( emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.Builder addNormalCoolDownDataListBuilder( int index) { @@ -1116,7 +1336,11 @@ public emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData index, emu.grasscutter.net.proto.WidgetCoolDownDataOuterClass.WidgetCoolDownData.getDefaultInstance()); } /** - * repeated .WidgetCoolDownData normal_cool_down_data_list = 10; + * 
+       * obf: FKHAOJBLFLJ 可能不对 要与下面互换
+       *
+ * + * repeated .WidgetCoolDownData normal_cool_down_data_list = 8; */ public java.util.List getNormalCoolDownDataListBuilderList() { @@ -1205,9 +1429,9 @@ public emu.grasscutter.net.proto.WidgetCoolDownNotifyOuterClass.WidgetCoolDownNo java.lang.String[] descriptorData = { "\n\032WidgetCoolDownNotify.proto\032\030WidgetCool" + "DownData.proto\"\207\001\n\024WidgetCoolDownNotify\022" + - "6\n\031group_cool_down_data_list\030\007 \003(\0132\023.Wid" + + "6\n\031group_cool_down_data_list\030\002 \003(\0132\023.Wid" + "getCoolDownData\0227\n\032normal_cool_down_data" + - "_list\030\n \003(\0132\023.WidgetCoolDownDataB\033\n\031emu." + + "_list\030\010 \003(\0132\023.WidgetCoolDownDataB\033\n\031emu." + "grasscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WindFieldDungeonSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WindFieldDungeonSettleInfoOuterClass.java index ba1391c88a6..1c51e860305 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WindFieldDungeonSettleInfoOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WindFieldDungeonSettleInfoOuterClass.java @@ -19,55 +19,51 @@ public interface WindFieldDungeonSettleInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * repeated uint32 KDIFMAEJGIO = 3; - * @return A list containing the kDIFMAEJGIO. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; + * @return The enum numeric value on the wire for bJFBGMLLHBP. */ - java.util.List getKDIFMAEJGIOList(); + int getBJFBGMLLHBPValue(); /** - * repeated uint32 KDIFMAEJGIO = 3; - * @return The count of kDIFMAEJGIO. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; + * @return The bJFBGMLLHBP. */ - int getKDIFMAEJGIOCount(); + emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason getBJFBGMLLHBP(); + /** - * repeated uint32 KDIFMAEJGIO = 3; - * @param index The index of the element to return. - * @return The kDIFMAEJGIO at the given index. + * repeated uint32 BGJPHDILLAL = 10; + * @return A list containing the bGJPHDILLAL. */ - int getKDIFMAEJGIO(int index); - + java.util.List getBGJPHDILLALList(); /** - * .WindFieldDungeonFailReason fail_reason = 12; - * @return The enum numeric value on the wire for failReason. + * repeated uint32 BGJPHDILLAL = 10; + * @return The count of bGJPHDILLAL. */ - int getFailReasonValue(); + int getBGJPHDILLALCount(); /** - * .WindFieldDungeonFailReason fail_reason = 12; - * @return The failReason. + * repeated uint32 BGJPHDILLAL = 10; + * @param index The index of the element to return. + * @return The bGJPHDILLAL at the given index. */ - emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason getFailReason(); + int getBGJPHDILLAL(int index); /** - * repeated uint32 AKDFKBJLGGI = 11; - * @return A list containing the aKDFKBJLGGI. + * repeated uint32 NLMIJMCGKIF = 14; + * @return A list containing the nLMIJMCGKIF. */ - java.util.List getAKDFKBJLGGIList(); + java.util.List getNLMIJMCGKIFList(); /** - * repeated uint32 AKDFKBJLGGI = 11; - * @return The count of aKDFKBJLGGI. + * repeated uint32 NLMIJMCGKIF = 14; + * @return The count of nLMIJMCGKIF. */ - int getAKDFKBJLGGICount(); + int getNLMIJMCGKIFCount(); /** - * repeated uint32 AKDFKBJLGGI = 11; + * repeated uint32 NLMIJMCGKIF = 14; * @param index The index of the element to return. - * @return The aKDFKBJLGGI at the given index. + * @return The nLMIJMCGKIF at the given index. */ - int getAKDFKBJLGGI(int index); + int getNLMIJMCGKIF(int index); } /** - * 
-   * Obf: KGEBGAHEFLG
-   *
- * * Protobuf type {@code WindFieldDungeonSettleInfo} */ public static final class WindFieldDungeonSettleInfo extends @@ -80,9 +76,9 @@ private WindFieldDungeonSettleInfo(com.google.protobuf.GeneratedMessageV3.Builde super(builder); } private WindFieldDungeonSettleInfo() { - kDIFMAEJGIO_ = emptyIntList(); - failReason_ = 0; - aKDFKBJLGGI_ = emptyIntList(); + bJFBGMLLHBP_ = 0; + bGJPHDILLAL_ = emptyIntList(); + nLMIJMCGKIF_ = emptyIntList(); } @java.lang.Override @@ -116,54 +112,54 @@ private WindFieldDungeonSettleInfo( case 0: done = true; break; - case 24: { + case 16: { + int rawValue = input.readEnum(); + + bJFBGMLLHBP_ = rawValue; + break; + } + case 80: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - kDIFMAEJGIO_ = newIntList(); + bGJPHDILLAL_ = newIntList(); mutable_bitField0_ |= 0x00000001; } - kDIFMAEJGIO_.addInt(input.readUInt32()); + bGJPHDILLAL_.addInt(input.readUInt32()); break; } - case 26: { + case 82: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) { - kDIFMAEJGIO_ = newIntList(); + bGJPHDILLAL_ = newIntList(); mutable_bitField0_ |= 0x00000001; } while (input.getBytesUntilLimit() > 0) { - kDIFMAEJGIO_.addInt(input.readUInt32()); + bGJPHDILLAL_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 88: { + case 112: { if (!((mutable_bitField0_ & 0x00000002) != 0)) { - aKDFKBJLGGI_ = newIntList(); + nLMIJMCGKIF_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - aKDFKBJLGGI_.addInt(input.readUInt32()); + nLMIJMCGKIF_.addInt(input.readUInt32()); break; } - case 90: { + case 114: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { - aKDFKBJLGGI_ = newIntList(); + nLMIJMCGKIF_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - aKDFKBJLGGI_.addInt(input.readUInt32()); + nLMIJMCGKIF_.addInt(input.readUInt32()); } input.popLimit(limit); break; } - case 96: { - int rawValue = input.readEnum(); - - failReason_ = rawValue; - break; - } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -180,10 +176,10 @@ private WindFieldDungeonSettleInfo( e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - kDIFMAEJGIO_.makeImmutable(); // C + bGJPHDILLAL_.makeImmutable(); // C } if (((mutable_bitField0_ & 0x00000002) != 0)) { - aKDFKBJLGGI_.makeImmutable(); // C + nLMIJMCGKIF_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -202,80 +198,80 @@ private WindFieldDungeonSettleInfo( emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.class, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder.class); } - public static final int KDIFMAEJGIO_FIELD_NUMBER = 3; - private com.google.protobuf.Internal.IntList kDIFMAEJGIO_; + public static final int BJFBGMLLHBP_FIELD_NUMBER = 2; + private int bJFBGMLLHBP_; /** - * repeated uint32 KDIFMAEJGIO = 3; - * @return A list containing the kDIFMAEJGIO. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; + * @return The enum numeric value on the wire for bJFBGMLLHBP. */ - @java.lang.Override - public java.util.List - getKDIFMAEJGIOList() { - return kDIFMAEJGIO_; + @java.lang.Override public int getBJFBGMLLHBPValue() { + return bJFBGMLLHBP_; } /** - * repeated uint32 KDIFMAEJGIO = 3; - * @return The count of kDIFMAEJGIO. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; + * @return The bJFBGMLLHBP. */ - public int getKDIFMAEJGIOCount() { - return kDIFMAEJGIO_.size(); + @java.lang.Override public emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason getBJFBGMLLHBP() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason result = emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.valueOf(bJFBGMLLHBP_); + return result == null ? emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.UNRECOGNIZED : result; } + + public static final int BGJPHDILLAL_FIELD_NUMBER = 10; + private com.google.protobuf.Internal.IntList bGJPHDILLAL_; /** - * repeated uint32 KDIFMAEJGIO = 3; - * @param index The index of the element to return. - * @return The kDIFMAEJGIO at the given index. + * repeated uint32 BGJPHDILLAL = 10; + * @return A list containing the bGJPHDILLAL. */ - public int getKDIFMAEJGIO(int index) { - return kDIFMAEJGIO_.getInt(index); + @java.lang.Override + public java.util.List + getBGJPHDILLALList() { + return bGJPHDILLAL_; } - private int kDIFMAEJGIOMemoizedSerializedSize = -1; - - public static final int FAIL_REASON_FIELD_NUMBER = 12; - private int failReason_; /** - * .WindFieldDungeonFailReason fail_reason = 12; - * @return The enum numeric value on the wire for failReason. + * repeated uint32 BGJPHDILLAL = 10; + * @return The count of bGJPHDILLAL. */ - @java.lang.Override public int getFailReasonValue() { - return failReason_; + public int getBGJPHDILLALCount() { + return bGJPHDILLAL_.size(); } /** - * .WindFieldDungeonFailReason fail_reason = 12; - * @return The failReason. + * repeated uint32 BGJPHDILLAL = 10; + * @param index The index of the element to return. + * @return The bGJPHDILLAL at the given index. */ - @java.lang.Override public emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason getFailReason() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason result = emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.valueOf(failReason_); - return result == null ? emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.UNRECOGNIZED : result; + public int getBGJPHDILLAL(int index) { + return bGJPHDILLAL_.getInt(index); } + private int bGJPHDILLALMemoizedSerializedSize = -1; - public static final int AKDFKBJLGGI_FIELD_NUMBER = 11; - private com.google.protobuf.Internal.IntList aKDFKBJLGGI_; + public static final int NLMIJMCGKIF_FIELD_NUMBER = 14; + private com.google.protobuf.Internal.IntList nLMIJMCGKIF_; /** - * repeated uint32 AKDFKBJLGGI = 11; - * @return A list containing the aKDFKBJLGGI. + * repeated uint32 NLMIJMCGKIF = 14; + * @return A list containing the nLMIJMCGKIF. */ @java.lang.Override public java.util.List - getAKDFKBJLGGIList() { - return aKDFKBJLGGI_; + getNLMIJMCGKIFList() { + return nLMIJMCGKIF_; } /** - * repeated uint32 AKDFKBJLGGI = 11; - * @return The count of aKDFKBJLGGI. + * repeated uint32 NLMIJMCGKIF = 14; + * @return The count of nLMIJMCGKIF. */ - public int getAKDFKBJLGGICount() { - return aKDFKBJLGGI_.size(); + public int getNLMIJMCGKIFCount() { + return nLMIJMCGKIF_.size(); } /** - * repeated uint32 AKDFKBJLGGI = 11; + * repeated uint32 NLMIJMCGKIF = 14; * @param index The index of the element to return. - * @return The aKDFKBJLGGI at the given index. + * @return The nLMIJMCGKIF at the given index. */ - public int getAKDFKBJLGGI(int index) { - return aKDFKBJLGGI_.getInt(index); + public int getNLMIJMCGKIF(int index) { + return nLMIJMCGKIF_.getInt(index); } - private int aKDFKBJLGGIMemoizedSerializedSize = -1; + private int nLMIJMCGKIFMemoizedSerializedSize = -1; private byte memoizedIsInitialized = -1; @java.lang.Override @@ -292,22 +288,22 @@ public final boolean isInitialized() { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (getKDIFMAEJGIOList().size() > 0) { - output.writeUInt32NoTag(26); - output.writeUInt32NoTag(kDIFMAEJGIOMemoizedSerializedSize); + if (bJFBGMLLHBP_ != emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.WIND_FIELD_DUNGEON_FAIL_NONE.getNumber()) { + output.writeEnum(2, bJFBGMLLHBP_); } - for (int i = 0; i < kDIFMAEJGIO_.size(); i++) { - output.writeUInt32NoTag(kDIFMAEJGIO_.getInt(i)); + if (getBGJPHDILLALList().size() > 0) { + output.writeUInt32NoTag(82); + output.writeUInt32NoTag(bGJPHDILLALMemoizedSerializedSize); } - if (getAKDFKBJLGGIList().size() > 0) { - output.writeUInt32NoTag(90); - output.writeUInt32NoTag(aKDFKBJLGGIMemoizedSerializedSize); + for (int i = 0; i < bGJPHDILLAL_.size(); i++) { + output.writeUInt32NoTag(bGJPHDILLAL_.getInt(i)); } - for (int i = 0; i < aKDFKBJLGGI_.size(); i++) { - output.writeUInt32NoTag(aKDFKBJLGGI_.getInt(i)); + if (getNLMIJMCGKIFList().size() > 0) { + output.writeUInt32NoTag(114); + output.writeUInt32NoTag(nLMIJMCGKIFMemoizedSerializedSize); } - if (failReason_ != emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.WIND_FIELD_DUNGEON_FAIL_NONE.getNumber()) { - output.writeEnum(12, failReason_); + for (int i = 0; i < nLMIJMCGKIF_.size(); i++) { + output.writeUInt32NoTag(nLMIJMCGKIF_.getInt(i)); } unknownFields.writeTo(output); } @@ -318,37 +314,37 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (bJFBGMLLHBP_ != emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.WIND_FIELD_DUNGEON_FAIL_NONE.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(2, bJFBGMLLHBP_); + } { int dataSize = 0; - for (int i = 0; i < kDIFMAEJGIO_.size(); i++) { + for (int i = 0; i < bGJPHDILLAL_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(kDIFMAEJGIO_.getInt(i)); + .computeUInt32SizeNoTag(bGJPHDILLAL_.getInt(i)); } size += dataSize; - if (!getKDIFMAEJGIOList().isEmpty()) { + if (!getBGJPHDILLALList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - kDIFMAEJGIOMemoizedSerializedSize = dataSize; + bGJPHDILLALMemoizedSerializedSize = dataSize; } { int dataSize = 0; - for (int i = 0; i < aKDFKBJLGGI_.size(); i++) { + for (int i = 0; i < nLMIJMCGKIF_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(aKDFKBJLGGI_.getInt(i)); + .computeUInt32SizeNoTag(nLMIJMCGKIF_.getInt(i)); } size += dataSize; - if (!getAKDFKBJLGGIList().isEmpty()) { + if (!getNLMIJMCGKIFList().isEmpty()) { size += 1; size += com.google.protobuf.CodedOutputStream .computeInt32SizeNoTag(dataSize); } - aKDFKBJLGGIMemoizedSerializedSize = dataSize; - } - if (failReason_ != emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.WIND_FIELD_DUNGEON_FAIL_NONE.getNumber()) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(12, failReason_); + nLMIJMCGKIFMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -365,11 +361,11 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo other = (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) obj; - if (!getKDIFMAEJGIOList() - .equals(other.getKDIFMAEJGIOList())) return false; - if (failReason_ != other.failReason_) return false; - if (!getAKDFKBJLGGIList() - .equals(other.getAKDFKBJLGGIList())) return false; + if (bJFBGMLLHBP_ != other.bJFBGMLLHBP_) return false; + if (!getBGJPHDILLALList() + .equals(other.getBGJPHDILLALList())) return false; + if (!getNLMIJMCGKIFList() + .equals(other.getNLMIJMCGKIFList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -381,15 +377,15 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getKDIFMAEJGIOCount() > 0) { - hash = (37 * hash) + KDIFMAEJGIO_FIELD_NUMBER; - hash = (53 * hash) + getKDIFMAEJGIOList().hashCode(); + hash = (37 * hash) + BJFBGMLLHBP_FIELD_NUMBER; + hash = (53 * hash) + bJFBGMLLHBP_; + if (getBGJPHDILLALCount() > 0) { + hash = (37 * hash) + BGJPHDILLAL_FIELD_NUMBER; + hash = (53 * hash) + getBGJPHDILLALList().hashCode(); } - hash = (37 * hash) + FAIL_REASON_FIELD_NUMBER; - hash = (53 * hash) + failReason_; - if (getAKDFKBJLGGICount() > 0) { - hash = (37 * hash) + AKDFKBJLGGI_FIELD_NUMBER; - hash = (53 * hash) + getAKDFKBJLGGIList().hashCode(); + if (getNLMIJMCGKIFCount() > 0) { + hash = (37 * hash) + NLMIJMCGKIF_FIELD_NUMBER; + hash = (53 * hash) + getNLMIJMCGKIFList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -487,10 +483,6 @@ protected Builder newBuilderForType( return builder; } /** - * 
-     * Obf: KGEBGAHEFLG
-     *
- * * Protobuf type {@code WindFieldDungeonSettleInfo} */ public static final class Builder extends @@ -528,11 +520,11 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - kDIFMAEJGIO_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - failReason_ = 0; + bJFBGMLLHBP_ = 0; - aKDFKBJLGGI_ = emptyIntList(); + bGJPHDILLAL_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); + nLMIJMCGKIF_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -561,17 +553,17 @@ public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldD public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo buildPartial() { emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo result = new emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo(this); int from_bitField0_ = bitField0_; + result.bJFBGMLLHBP_ = bJFBGMLLHBP_; if (((bitField0_ & 0x00000001) != 0)) { - kDIFMAEJGIO_.makeImmutable(); + bGJPHDILLAL_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000001); } - result.kDIFMAEJGIO_ = kDIFMAEJGIO_; - result.failReason_ = failReason_; + result.bGJPHDILLAL_ = bGJPHDILLAL_; if (((bitField0_ & 0x00000002) != 0)) { - aKDFKBJLGGI_.makeImmutable(); + nLMIJMCGKIF_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } - result.aKDFKBJLGGI_ = aKDFKBJLGGI_; + result.nLMIJMCGKIF_ = nLMIJMCGKIF_; onBuilt(); return result; } @@ -620,26 +612,26 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo other) { if (other == emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance()) return this; - if (!other.kDIFMAEJGIO_.isEmpty()) { - if (kDIFMAEJGIO_.isEmpty()) { - kDIFMAEJGIO_ = other.kDIFMAEJGIO_; + if (other.bJFBGMLLHBP_ != 0) { + setBJFBGMLLHBPValue(other.getBJFBGMLLHBPValue()); + } + if (!other.bGJPHDILLAL_.isEmpty()) { + if (bGJPHDILLAL_.isEmpty()) { + bGJPHDILLAL_ = other.bGJPHDILLAL_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureKDIFMAEJGIOIsMutable(); - kDIFMAEJGIO_.addAll(other.kDIFMAEJGIO_); + ensureBGJPHDILLALIsMutable(); + bGJPHDILLAL_.addAll(other.bGJPHDILLAL_); } onChanged(); } - if (other.failReason_ != 0) { - setFailReasonValue(other.getFailReasonValue()); - } - if (!other.aKDFKBJLGGI_.isEmpty()) { - if (aKDFKBJLGGI_.isEmpty()) { - aKDFKBJLGGI_ = other.aKDFKBJLGGI_; + if (!other.nLMIJMCGKIF_.isEmpty()) { + if (nLMIJMCGKIF_.isEmpty()) { + nLMIJMCGKIF_ = other.nLMIJMCGKIF_; bitField0_ = (bitField0_ & ~0x00000002); } else { - ensureAKDFKBJLGGIIsMutable(); - aKDFKBJLGGI_.addAll(other.aKDFKBJLGGI_); + ensureNLMIJMCGKIFIsMutable(); + nLMIJMCGKIF_.addAll(other.nLMIJMCGKIF_); } onChanged(); } @@ -673,213 +665,213 @@ public Builder mergeFrom( } private int bitField0_; - private com.google.protobuf.Internal.IntList kDIFMAEJGIO_ = emptyIntList(); - private void ensureKDIFMAEJGIOIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - kDIFMAEJGIO_ = mutableCopy(kDIFMAEJGIO_); - bitField0_ |= 0x00000001; - } - } + private int bJFBGMLLHBP_ = 0; /** - * repeated uint32 KDIFMAEJGIO = 3; - * @return A list containing the kDIFMAEJGIO. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; + * @return The enum numeric value on the wire for bJFBGMLLHBP. */ - public java.util.List - getKDIFMAEJGIOList() { - return ((bitField0_ & 0x00000001) != 0) ? - java.util.Collections.unmodifiableList(kDIFMAEJGIO_) : kDIFMAEJGIO_; + @java.lang.Override public int getBJFBGMLLHBPValue() { + return bJFBGMLLHBP_; } /** - * repeated uint32 KDIFMAEJGIO = 3; - * @return The count of kDIFMAEJGIO. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; + * @param value The enum numeric value on the wire for bJFBGMLLHBP to set. + * @return This builder for chaining. */ - public int getKDIFMAEJGIOCount() { - return kDIFMAEJGIO_.size(); + public Builder setBJFBGMLLHBPValue(int value) { + + bJFBGMLLHBP_ = value; + onChanged(); + return this; } /** - * repeated uint32 KDIFMAEJGIO = 3; - * @param index The index of the element to return. - * @return The kDIFMAEJGIO at the given index. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; + * @return The bJFBGMLLHBP. */ - public int getKDIFMAEJGIO(int index) { - return kDIFMAEJGIO_.getInt(index); + @java.lang.Override + public emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason getBJFBGMLLHBP() { + @SuppressWarnings("deprecation") + emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason result = emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.valueOf(bJFBGMLLHBP_); + return result == null ? emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.UNRECOGNIZED : result; } /** - * repeated uint32 KDIFMAEJGIO = 3; - * @param index The index to set the value at. - * @param value The kDIFMAEJGIO to set. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; + * @param value The bJFBGMLLHBP to set. * @return This builder for chaining. */ - public Builder setKDIFMAEJGIO( - int index, int value) { - ensureKDIFMAEJGIOIsMutable(); - kDIFMAEJGIO_.setInt(index, value); + public Builder setBJFBGMLLHBP(emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason value) { + if (value == null) { + throw new NullPointerException(); + } + + bJFBGMLLHBP_ = value.getNumber(); onChanged(); return this; } /** - * repeated uint32 KDIFMAEJGIO = 3; - * @param value The kDIFMAEJGIO to add. + * .WindFieldDungeonFailReason BJFBGMLLHBP = 2; * @return This builder for chaining. */ - public Builder addKDIFMAEJGIO(int value) { - ensureKDIFMAEJGIOIsMutable(); - kDIFMAEJGIO_.addInt(value); + public Builder clearBJFBGMLLHBP() { + + bJFBGMLLHBP_ = 0; onChanged(); return this; } + + private com.google.protobuf.Internal.IntList bGJPHDILLAL_ = emptyIntList(); + private void ensureBGJPHDILLALIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + bGJPHDILLAL_ = mutableCopy(bGJPHDILLAL_); + bitField0_ |= 0x00000001; + } + } /** - * repeated uint32 KDIFMAEJGIO = 3; - * @param values The kDIFMAEJGIO to add. - * @return This builder for chaining. + * repeated uint32 BGJPHDILLAL = 10; + * @return A list containing the bGJPHDILLAL. */ - public Builder addAllKDIFMAEJGIO( - java.lang.Iterable values) { - ensureKDIFMAEJGIOIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, kDIFMAEJGIO_); - onChanged(); - return this; + public java.util.List + getBGJPHDILLALList() { + return ((bitField0_ & 0x00000001) != 0) ? + java.util.Collections.unmodifiableList(bGJPHDILLAL_) : bGJPHDILLAL_; } /** - * repeated uint32 KDIFMAEJGIO = 3; - * @return This builder for chaining. + * repeated uint32 BGJPHDILLAL = 10; + * @return The count of bGJPHDILLAL. */ - public Builder clearKDIFMAEJGIO() { - kDIFMAEJGIO_ = emptyIntList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; + public int getBGJPHDILLALCount() { + return bGJPHDILLAL_.size(); } - - private int failReason_ = 0; /** - * .WindFieldDungeonFailReason fail_reason = 12; - * @return The enum numeric value on the wire for failReason. + * repeated uint32 BGJPHDILLAL = 10; + * @param index The index of the element to return. + * @return The bGJPHDILLAL at the given index. */ - @java.lang.Override public int getFailReasonValue() { - return failReason_; + public int getBGJPHDILLAL(int index) { + return bGJPHDILLAL_.getInt(index); } /** - * .WindFieldDungeonFailReason fail_reason = 12; - * @param value The enum numeric value on the wire for failReason to set. + * repeated uint32 BGJPHDILLAL = 10; + * @param index The index to set the value at. + * @param value The bGJPHDILLAL to set. * @return This builder for chaining. */ - public Builder setFailReasonValue(int value) { - - failReason_ = value; + public Builder setBGJPHDILLAL( + int index, int value) { + ensureBGJPHDILLALIsMutable(); + bGJPHDILLAL_.setInt(index, value); onChanged(); return this; } /** - * .WindFieldDungeonFailReason fail_reason = 12; - * @return The failReason. + * repeated uint32 BGJPHDILLAL = 10; + * @param value The bGJPHDILLAL to add. + * @return This builder for chaining. */ - @java.lang.Override - public emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason getFailReason() { - @SuppressWarnings("deprecation") - emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason result = emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.valueOf(failReason_); - return result == null ? emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason.UNRECOGNIZED : result; + public Builder addBGJPHDILLAL(int value) { + ensureBGJPHDILLALIsMutable(); + bGJPHDILLAL_.addInt(value); + onChanged(); + return this; } /** - * .WindFieldDungeonFailReason fail_reason = 12; - * @param value The failReason to set. + * repeated uint32 BGJPHDILLAL = 10; + * @param values The bGJPHDILLAL to add. * @return This builder for chaining. */ - public Builder setFailReason(emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.WindFieldDungeonFailReason value) { - if (value == null) { - throw new NullPointerException(); - } - - failReason_ = value.getNumber(); + public Builder addAllBGJPHDILLAL( + java.lang.Iterable values) { + ensureBGJPHDILLALIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, bGJPHDILLAL_); onChanged(); return this; } /** - * .WindFieldDungeonFailReason fail_reason = 12; + * repeated uint32 BGJPHDILLAL = 10; * @return This builder for chaining. */ - public Builder clearFailReason() { - - failReason_ = 0; + public Builder clearBGJPHDILLAL() { + bGJPHDILLAL_ = emptyIntList(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } - private com.google.protobuf.Internal.IntList aKDFKBJLGGI_ = emptyIntList(); - private void ensureAKDFKBJLGGIIsMutable() { + private com.google.protobuf.Internal.IntList nLMIJMCGKIF_ = emptyIntList(); + private void ensureNLMIJMCGKIFIsMutable() { if (!((bitField0_ & 0x00000002) != 0)) { - aKDFKBJLGGI_ = mutableCopy(aKDFKBJLGGI_); + nLMIJMCGKIF_ = mutableCopy(nLMIJMCGKIF_); bitField0_ |= 0x00000002; } } /** - * repeated uint32 AKDFKBJLGGI = 11; - * @return A list containing the aKDFKBJLGGI. + * repeated uint32 NLMIJMCGKIF = 14; + * @return A list containing the nLMIJMCGKIF. */ public java.util.List - getAKDFKBJLGGIList() { + getNLMIJMCGKIFList() { return ((bitField0_ & 0x00000002) != 0) ? - java.util.Collections.unmodifiableList(aKDFKBJLGGI_) : aKDFKBJLGGI_; + java.util.Collections.unmodifiableList(nLMIJMCGKIF_) : nLMIJMCGKIF_; } /** - * repeated uint32 AKDFKBJLGGI = 11; - * @return The count of aKDFKBJLGGI. + * repeated uint32 NLMIJMCGKIF = 14; + * @return The count of nLMIJMCGKIF. */ - public int getAKDFKBJLGGICount() { - return aKDFKBJLGGI_.size(); + public int getNLMIJMCGKIFCount() { + return nLMIJMCGKIF_.size(); } /** - * repeated uint32 AKDFKBJLGGI = 11; + * repeated uint32 NLMIJMCGKIF = 14; * @param index The index of the element to return. - * @return The aKDFKBJLGGI at the given index. + * @return The nLMIJMCGKIF at the given index. */ - public int getAKDFKBJLGGI(int index) { - return aKDFKBJLGGI_.getInt(index); + public int getNLMIJMCGKIF(int index) { + return nLMIJMCGKIF_.getInt(index); } /** - * repeated uint32 AKDFKBJLGGI = 11; + * repeated uint32 NLMIJMCGKIF = 14; * @param index The index to set the value at. - * @param value The aKDFKBJLGGI to set. + * @param value The nLMIJMCGKIF to set. * @return This builder for chaining. */ - public Builder setAKDFKBJLGGI( + public Builder setNLMIJMCGKIF( int index, int value) { - ensureAKDFKBJLGGIIsMutable(); - aKDFKBJLGGI_.setInt(index, value); + ensureNLMIJMCGKIFIsMutable(); + nLMIJMCGKIF_.setInt(index, value); onChanged(); return this; } /** - * repeated uint32 AKDFKBJLGGI = 11; - * @param value The aKDFKBJLGGI to add. + * repeated uint32 NLMIJMCGKIF = 14; + * @param value The nLMIJMCGKIF to add. * @return This builder for chaining. */ - public Builder addAKDFKBJLGGI(int value) { - ensureAKDFKBJLGGIIsMutable(); - aKDFKBJLGGI_.addInt(value); + public Builder addNLMIJMCGKIF(int value) { + ensureNLMIJMCGKIFIsMutable(); + nLMIJMCGKIF_.addInt(value); onChanged(); return this; } /** - * repeated uint32 AKDFKBJLGGI = 11; - * @param values The aKDFKBJLGGI to add. + * repeated uint32 NLMIJMCGKIF = 14; + * @param values The nLMIJMCGKIF to add. * @return This builder for chaining. */ - public Builder addAllAKDFKBJLGGI( + public Builder addAllNLMIJMCGKIF( java.lang.Iterable values) { - ensureAKDFKBJLGGIIsMutable(); + ensureNLMIJMCGKIFIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, aKDFKBJLGGI_); + values, nLMIJMCGKIF_); onChanged(); return this; } /** - * repeated uint32 AKDFKBJLGGI = 11; + * repeated uint32 NLMIJMCGKIF = 14; * @return This builder for chaining. */ - public Builder clearAKDFKBJLGGI() { - aKDFKBJLGGI_ = emptyIntList(); + public Builder clearNLMIJMCGKIF() { + nLMIJMCGKIF_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; @@ -953,9 +945,9 @@ public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldD java.lang.String[] descriptorData = { "\n WindFieldDungeonSettleInfo.proto\032 Wind" + "FieldDungeonFailReason.proto\"x\n\032WindFiel" + - "dDungeonSettleInfo\022\023\n\013KDIFMAEJGIO\030\003 \003(\r\022" + - "0\n\013fail_reason\030\014 \001(\0162\033.WindFieldDungeonF" + - "ailReason\022\023\n\013AKDFKBJLGGI\030\013 \003(\rB\033\n\031emu.gr" + + "dDungeonSettleInfo\0220\n\013BJFBGMLLHBP\030\002 \001(\0162" + + "\033.WindFieldDungeonFailReason\022\023\n\013BGJPHDIL" + + "LAL\030\n \003(\r\022\023\n\013NLMIJMCGKIF\030\016 \003(\rB\033\n\031emu.gr" + "asscutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -968,7 +960,7 @@ public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldD internal_static_WindFieldDungeonSettleInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WindFieldDungeonSettleInfo_descriptor, - new java.lang.String[] { "KDIFMAEJGIO", "FailReason", "AKDFKBJLGGI", }); + new java.lang.String[] { "BJFBGMLLHBP", "BGJPHDILLAL", "NLMIJMCGKIF", }); emu.grasscutter.net.proto.WindFieldDungeonFailReasonOuterClass.getDescriptor(); } diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldChestOpenNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldChestOpenNotifyOuterClass.java index 22f952dafc0..80507de0524 100644 --- a/src/generated/main/java/emu/grasscutter/net/proto/WorldChestOpenNotifyOuterClass.java +++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldChestOpenNotifyOuterClass.java @@ -19,27 +19,27 @@ public interface WorldChestOpenNotifyOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * uint32 group_id = 5; + * uint32 scene_id = 5; + * @return The sceneId. + */ + int getSceneId(); + + /** + * uint32 group_id = 7; * @return The groupId. */ int getGroupId(); /** - * uint32 config_id = 4; + * uint32 config_id = 13; * @return The configId. */ int getConfigId(); - - /** - * uint32 scene_id = 11; - * @return The sceneId. - */ - int getSceneId(); } /** * 
-   * CmdId: 9116
-   * Obf: CMEJIMOMCEO
+   * CmdId: 2812
+   * obf: IEHIJGIEKLH
    *
* * Protobuf type {@code WorldChestOpenNotify} @@ -86,19 +86,19 @@ private WorldChestOpenNotify( case 0: done = true; break; - case 32: { + case 40: { - configId_ = input.readUInt32(); + sceneId_ = input.readUInt32(); break; } - case 40: { + case 56: { groupId_ = input.readUInt32(); break; } - case 88: { + case 104: { - sceneId_ = input.readUInt32(); + configId_ = input.readUInt32(); break; } default: { @@ -133,10 +133,21 @@ private WorldChestOpenNotify( emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify.class, emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify.Builder.class); } - public static final int GROUP_ID_FIELD_NUMBER = 5; + public static final int SCENE_ID_FIELD_NUMBER = 5; + private int sceneId_; + /** + * uint32 scene_id = 5; + * @return The sceneId. + */ + @java.lang.Override + public int getSceneId() { + return sceneId_; + } + + public static final int GROUP_ID_FIELD_NUMBER = 7; private int groupId_; /** - * uint32 group_id = 5; + * uint32 group_id = 7; * @return The groupId. */ @java.lang.Override @@ -144,10 +155,10 @@ public int getGroupId() { return groupId_; } - public static final int CONFIG_ID_FIELD_NUMBER = 4; + public static final int CONFIG_ID_FIELD_NUMBER = 13; private int configId_; /** - * uint32 config_id = 4; + * uint32 config_id = 13; * @return The configId. */ @java.lang.Override @@ -155,17 +166,6 @@ public int getConfigId() { return configId_; } - public static final int SCENE_ID_FIELD_NUMBER = 11; - private int sceneId_; - /** - * uint32 scene_id = 11; - * @return The sceneId. - */ - @java.lang.Override - public int getSceneId() { - return sceneId_; - } - private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -180,14 +180,14 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (configId_ != 0) { - output.writeUInt32(4, configId_); + if (sceneId_ != 0) { + output.writeUInt32(5, sceneId_); } if (groupId_ != 0) { - output.writeUInt32(5, groupId_); + output.writeUInt32(7, groupId_); } - if (sceneId_ != 0) { - output.writeUInt32(11, sceneId_); + if (configId_ != 0) { + output.writeUInt32(13, configId_); } unknownFields.writeTo(output); } @@ -198,17 +198,17 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (configId_ != 0) { + if (sceneId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, configId_); + .computeUInt32Size(5, sceneId_); } if (groupId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(5, groupId_); + .computeUInt32Size(7, groupId_); } - if (sceneId_ != 0) { + if (configId_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(11, sceneId_); + .computeUInt32Size(13, configId_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -225,12 +225,12 @@ public boolean equals(final java.lang.Object obj) { } emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify other = (emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify) obj; + if (getSceneId() + != other.getSceneId()) return false; if (getGroupId() != other.getGroupId()) return false; if (getConfigId() != other.getConfigId()) return false; - if (getSceneId() - != other.getSceneId()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -242,12 +242,12 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; + hash = (53 * hash) + getSceneId(); hash = (37 * hash) + GROUP_ID_FIELD_NUMBER; hash = (53 * hash) + getGroupId(); hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER; hash = (53 * hash) + getConfigId(); - hash = (37 * hash) + SCENE_ID_FIELD_NUMBER; - hash = (53 * hash) + getSceneId(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -345,8 +345,8 @@ protected Builder newBuilderForType( } /** * 
-     * CmdId: 9116
-     * Obf: CMEJIMOMCEO
+     * CmdId: 2812
+     * obf: IEHIJGIEKLH
      *
* * Protobuf type {@code WorldChestOpenNotify} @@ -386,12 +386,12 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + sceneId_ = 0; + groupId_ = 0; configId_ = 0; - sceneId_ = 0; - return this; } @@ -418,9 +418,9 @@ public emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNo @java.lang.Override public emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify buildPartial() { emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify result = new emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify(this); + result.sceneId_ = sceneId_; result.groupId_ = groupId_; result.configId_ = configId_; - result.sceneId_ = sceneId_; onBuilt(); return result; } @@ -469,15 +469,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify other) { if (other == emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify.getDefaultInstance()) return this; + if (other.getSceneId() != 0) { + setSceneId(other.getSceneId()); + } if (other.getGroupId() != 0) { setGroupId(other.getGroupId()); } if (other.getConfigId() != 0) { setConfigId(other.getConfigId()); } - if (other.getSceneId() != 0) { - setSceneId(other.getSceneId()); - } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -507,95 +507,95 @@ public Builder mergeFrom( return this; } - private int groupId_ ; + private int sceneId_ ; /** - * uint32 group_id = 5; - * @return The groupId. + * uint32 scene_id = 5; + * @return The sceneId. */ @java.lang.Override - public int getGroupId() { - return groupId_; + public int getSceneId() { + return sceneId_; } /** - * uint32 group_id = 5; - * @param value The groupId to set. + * uint32 scene_id = 5; + * @param value The sceneId to set. * @return This builder for chaining. */ - public Builder setGroupId(int value) { + public Builder setSceneId(int value) { - groupId_ = value; + sceneId_ = value; onChanged(); return this; } /** - * uint32 group_id = 5; + * uint32 scene_id = 5; * @return This builder for chaining. */ - public Builder clearGroupId() { + public Builder clearSceneId() { - groupId_ = 0; + sceneId_ = 0; onChanged(); return this; } - private int configId_ ; + private int groupId_ ; /** - * uint32 config_id = 4; - * @return The configId. + * uint32 group_id = 7; + * @return The groupId. */ @java.lang.Override - public int getConfigId() { - return configId_; + public int getGroupId() { + return groupId_; } /** - * uint32 config_id = 4; - * @param value The configId to set. + * uint32 group_id = 7; + * @param value The groupId to set. * @return This builder for chaining. */ - public Builder setConfigId(int value) { + public Builder setGroupId(int value) { - configId_ = value; + groupId_ = value; onChanged(); return this; } /** - * uint32 config_id = 4; + * uint32 group_id = 7; * @return This builder for chaining. */ - public Builder clearConfigId() { + public Builder clearGroupId() { - configId_ = 0; + groupId_ = 0; onChanged(); return this; } - private int sceneId_ ; + private int configId_ ; /** - * uint32 scene_id = 11; - * @return The sceneId. + * uint32 config_id = 13; + * @return The configId. */ @java.lang.Override - public int getSceneId() { - return sceneId_; + public int getConfigId() { + return configId_; } /** - * uint32 scene_id = 11; - * @param value The sceneId to set. + * uint32 config_id = 13; + * @param value The configId to set. * @return This builder for chaining. */ - public Builder setSceneId(int value) { + public Builder setConfigId(int value) { - sceneId_ = value; + configId_ = value; onChanged(); return this; } /** - * uint32 scene_id = 11; + * uint32 config_id = 13; * @return This builder for chaining. */ - public Builder clearSceneId() { + public Builder clearConfigId() { - sceneId_ = 0; + configId_ = 0; onChanged(); return this; } @@ -667,8 +667,8 @@ public emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNo static { java.lang.String[] descriptorData = { "\n\032WorldChestOpenNotify.proto\"M\n\024WorldChe" + - "stOpenNotify\022\020\n\010group_id\030\005 \001(\r\022\021\n\tconfig" + - "_id\030\004 \001(\r\022\020\n\010scene_id\030\013 \001(\rB\033\n\031emu.grass" + + "stOpenNotify\022\020\n\010scene_id\030\005 \001(\r\022\020\n\010group_" + + "id\030\007 \001(\r\022\021\n\tconfig_id\030\r \001(\rB\033\n\031emu.grass" + "cutter.net.protob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor @@ -680,7 +680,7 @@ public emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNo internal_static_WorldChestOpenNotify_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_WorldChestOpenNotify_descriptor, - new java.lang.String[] { "GroupId", "ConfigId", "SceneId", }); + new java.lang.String[] { "SceneId", "GroupId", "ConfigId", }); } // @@protoc_insertion_point(outer_class_scope) From 487c56c4acbfb86dc0a33cd403fe0c1242dd0764 Mon Sep 17 00:00:00 2001 From: HongchengQ Date: Thu, 3 Oct 2024 00:11:59 +0800 Subject: [PATCH 2/3] update(5.0): CMD_ID --- .../grasscutter/net/packet/PacketOpcodes.java | 1226 +++++++++-------- 1 file changed, 625 insertions(+), 601 deletions(-) diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java index 3f95ac45e8d..30334300d0c 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java @@ -5,6 +5,631 @@ public final class PacketOpcodes { public static final int NONE = 0; // Opcodes + public static final int ClientScriptEventNotify = 29125; + public static final int AdjustWorldLevelRsp = 29530; + public static final int GetPlayerFriendListRsp = 893; + public static final int HomePreChangeEditModeNotify = 3607; + public static final int GetShopRsp = 5665; + public static final int SceneWeatherForcastReq = 23364; + public static final int AddBackupAvatarTeamRsp = 7660; + public static final int EvtBeingHitNotify = 4586; + public static final int PlayerSetPauseRsp = 25030; + public static final int OpenStateChangeNotify = 26658; + public static final int WeaponAwakenRsp = 24076; + public static final int DropHintNotify = 3881; + public static final int PlayerEnterDungeonReq = 7557; + public static final int HomeAvatarTalkRsp = 213; + public static final int GetActivityScheduleRsp = 26417; + public static final int AsterProgressInfoNotify = 5611; + public static final int GeniusInvokationTCGErrorNotify = 22320; + public static final int SelectWorktopOptionRsp = 1697; + public static final int MarkMapReq = 9550; + public static final int RemotePlayerWidgetNotify = 28693; + public static final int UnlockTransPointRsp = 23546; + public static final int LifeStateChangeNotify = 29321; + public static final int HomeAvatarSummonEventReq = 27629; + public static final int AvatarFetterLevelRewardRsp = 21750; + public static final int StoreWeightLimitNotify = 3034; + public static final int PlayerHomeCompInfoNotify = 20264; + public static final int CombatInvocationsNotify = 5253; + public static final int UnlockAvatarTalentReq = 6454; + public static final int GetProfilePictureDataRsp = 1846; + public static final int GetGachaInfoRsp = 9090; + public static final int DelBackupAvatarTeamReq = 8721; + public static final int GalleryWillStartCountdownNotify = 2443; + public static final int ClientQuitGameServerNotify = 20600; + public static final int ServerGlobalValueChangeNotify = 25816; + public static final int AvatarFetterDataNotify = 4274; + public static final int WearEquipReq = 7023; + public static final int TeamResonanceChangeNotify = 24686; + public static final int PullPrivateChatReq = 8925; + public static final int SelectWorktopOptionReq = 23125; + public static final int TowerCurLevelRecordChangeNotify = 7108; + public static final int TakeCompoundOutputRsp = 1235; + public static final int WeaponUpgradeRsp = 22661; + public static final int GetCityReputationInfoRsp = 9100; + public static final int AllMarkPointNotify = 24780; + public static final int UpdatePlayerShowNameCardListReq = 7487; + public static final int OtherPlayerEnterHomeNotify = 22683; + public static final int DoSetPlayerBornDataNotify = 5351; + public static final int AvatarSkillMaxChargeCountNotify = 28497; + public static final int SceneAudioNotify = 21580; + public static final int AvatarGainCostumeNotify = 25978; + public static final int AchievementUpdateNotify = 26226; + public static final int UpdatePlayerShowAvatarListReq = 3998; + public static final int ScenePlayerLocationNotify = 29696; + public static final int AvatarTeamUpdateNotify = 28759; + public static final int PlayerApplyEnterMpResultReq = 23674; + public static final int PlayerInvestigationNotify = 6848; + public static final int UnlockPersonalLineRsp = 24052; + public static final int EnterTransPointRegionNotify = 9692; + public static final int AvatarSkillChangeNotify = 4410; + public static final int MultistagePlayInfoNotify = 23240; + public static final int SetEquipLockStateRsp = 26633; + public static final int RegionSearchNotify = 22051; + public static final int HomeGetBasicInfoReq = 9267; + public static final int DungeonEntryInfoRsp = 27112; + public static final int HomeLimitedShopInfoRsp = 23361; + public static final int OpenStateUpdateNotify = 29093; + public static final int GetUgcDungeonBriefListRsp = 3263; + public static final int GetWidgetSlotReq = 9388; + public static final int GetPlayerTokenRsp = 24174; + public static final int WearEquipRsp = 3218; + public static final int PlayerCompoundMaterialRsp = 22858; + public static final int MonsterAlertChangeNotify = 6613; + public static final int PlayerChatNotify = 25824; + public static final int CutSceneFinishNotify = 8491; + public static final int SetPlayerSignatureReq = 1006; + public static final int SceneTransToPointReq = 4027; + public static final int EvtAvatarSitDownNotify = 22638; + public static final int SetEquipLockStateReq = 5750; + public static final int CutSceneBeginNotify = 455; + public static final int SceneAvatarStaminaStepReq = 20036; + public static final int EnterWorldAreaRsp = 7481; + public static final int EvtBeingHitsCombineNotify = 5583; + public static final int ClientAbilitiesInitFinishCombineNotify = 6545; + public static final int PushTipsAllDataNotify = 4364; + public static final int WorktopOptionNotify = 28583; + public static final int HostPlayerNotify = 2109; + public static final int AvatarWearFlycloakReq = 243; + public static final int PlayerSetPauseReq = 8076; + public static final int DungeonCandidateTeamInfoNotify = 8196; + public static final int PingReq = 5983; + public static final int HomeGetArrangementInfoRsp = 9688; + public static final int ViewCodexReq = 27047; + public static final int GetAllMailResultNotify = 20649; + public static final int QuestProgressUpdateNotify = 28348; + public static final int SetBattlePassViewedReq = 26483; + public static final int EvtAvatarEnterFocusNotify = 29042; + public static final int WeaponPromoteReq = 3230; + public static final int QuestTransmitReq = 24079; + public static final int WorldRoutineTypeRefreshNotify = 1571; + public static final int GetPlayerBlacklistRsp = 23797; + public static final int AvatarFightPropUpdateNotify = 20328; + public static final int OpenBlossomCircleCampGuideNotify = 8953; + public static final int SetPlayerBirthdayReq = 26726; + public static final int ChangeMailStarNotify = 29855; + public static final int UpdateAbilityCreatedMovingPlatformNotify = 6274; + public static final int SetPlayerBirthdayRsp = 9150; + public static final int FurnitureMakeReq = 25118; + public static final int CompoundUnlockNotify = 28422; + public static final int AbilityChangeNotify = 21684; + public static final int GetActivityInfoReq = 9710; + public static final int SyncScenePlayTeamEntityNotify = 26946; + public static final int GetFriendShowAvatarInfoReq = 20766; + public static final int PlayerQuitDungeonReq = 25440; + public static final int GetFriendShowAvatarInfoRsp = 27251; + public static final int AvatarChangeCostumeReq = 28185; + public static final int BatchDelMapMarkRsp = 2768; + public static final int CookDataNotify = 27676; + public static final int ChallengeDataNotify = 25295; + public static final int HomeAvatarSummonAllEventNotify = 22990; + public static final int SetPlayerNameRsp = 24044; + public static final int UnfreezeGroupLimitNotify = 2540; + public static final int MonsterSummonTagNotify = 21455; + public static final int DelMailReq = 8496; + public static final int SceneEntitiesMovesRsp = 27402; + public static final int GetMapMarkTipsRsp = 4123; + public static final int HomeChangeBgmNotify = 29481; + public static final int GmTalkRsp = 27437; + public static final int HomeChooseModuleRsp = 2292; + public static final int SetOpenStateRsp = 7944; + public static final int HomeEnterEditModeFinishReq = 9796; + public static final int TakeCompoundOutputReq = 24016; + public static final int QuestUpdateQuestVarNotify = 29565; + public static final int SceneForceLockNotify = 27356; + public static final int HomeEnterEditModeFinishRsp = 28448; + public static final int HomeAvatarCostumeChangeNotify = 7004; + public static final int TakeBattlePassRewardReq = 29828; + public static final int GetAllUnlockNameCardRsp = 2632; + public static final int TryEnterHomeRsp = 21829; + public static final int UseItemReq = 9576; + public static final int PlayerPropChangeReasonNotify = 25374; + public static final int TakeFurnitureMakeReq = 2795; + public static final int HomeAllUnlockedBgmIdListNotify = 22324; + public static final int ChangeTeamNameReq = 29880; + public static final int TowerEnterLevelRsp = 21726; + public static final int DeathZoneInfoNotify = 24379; + public static final int WorldOwnerBlossomBriefInfoNotify = 8720; + public static final int CombineReq = 21559; + public static final int ServerAnnounceNotify = 25165; + public static final int DropItemReq = 23432; + public static final int WidgetGadgetAllDataNotify = 26345; + public static final int GetDailyDungeonEntryInfoRsp = 6779; + public static final int ResinChangeNotify = 4336; + public static final int SetOpenStateReq = 24291; + public static final int StartRogueDiaryPlayRsp = 9097; + public static final int ProfilePictureUpdateNotify = 5942; + public static final int WidgetCoolDownNotify = 20751; + public static final int WorldPlayerInfoNotify = 23024; + public static final int MuqadasPotionSaveTeamReq = 3262; + public static final int AsterLittleInfoNotify = 5594; + public static final int QueryCodexMonsterBeKilledNumReq = 5718; + public static final int DailyTaskProgressNotify = 24088; + public static final int SkipPlayerGameTimeReq = 29432; + public static final int PlayerApplyEnterHomeResultNotify = 22086; + public static final int SetWidgetSlotReq = 22701; + public static final int McoinExchangeHcoinRsp = 21052; + public static final int PushTipsReadFinishReq = 5390; + public static final int EntityFightPropNotify = 1688; + public static final int GachaWishReq = 25407; + public static final int QuestDestroyEntityReq = 25911; + public static final int EntityFightPropChangeReasonNotify = 7107; + public static final int EntityTagChangeNotify = 29283; + public static final int ServerDisconnectClientNotify = 1387; + public static final int PlayerApplyEnterMpRsp = 24897; + public static final int GetParentQuestVideoKeyRsp = 28710; + public static final int AsterLargeInfoNotify = 9658; + public static final int PlayerMatchAgreedResultNotify = 1690; + public static final int ForgeGetQueueDataRsp = 27281; + public static final int EvtCreateGadgetNotify = 21187; + public static final int EnterScenePeerNotify = 9626; + public static final int PlayerPropNotify = 25998; + public static final int CombineRsp = 29627; + public static final int EnterSceneReadyReq = 20524; + public static final int MusicGameSettleReq = 7153; + public static final int GivingRecordNotify = 951; + public static final int FinishedParentQuestUpdateNotify = 28362; + public static final int UpdatePlayerShowNameCardListRsp = 8022; + public static final int ExitTransPointRegionNotify = 27579; + public static final int EvtAvatarStandUpNotify = 28594; + public static final int AvatarTeamAllDataNotify = 22603; + public static final int GetWidgetQuickSlotListReq = 24642; + public static final int DataResVersionNotify = 7450; + public static final int ScenePointUnlockNotify = 21959; + public static final int PlayerGameTimeNotify = 4423; + public static final int DungeonWayPointNotify = 3239; + public static final int HideAndSeekSelectAvatarRsp = 27773; + public static final int EnterCustomDungeonRsp = 6315; + public static final int QuestUpdateQuestVarRsp = 3297; + public static final int AvatarPromoteRsp = 1987; + public static final int ChangeAvatarReq = 3470; + public static final int ShowCommonTipsNotify = 20003; + public static final int GetMapAreaRsp = 22235; + public static final int AvatarEquipChangeNotify = 6767; + public static final int TowerBriefDataNotify = 6643; + public static final int WidgetDoBagRsp = 9170; + public static final int DestroyMaterialRsp = 21531; + public static final int PostEnterSceneReq = 3633; + public static final int AntiAddictNotify = 20752; + public static final int PingRsp = 22595; + public static final int PlayerForceExitReq = 26372; + public static final int GetWorldMpInfoRsp = 3080; + public static final int ReliquaryDecomposeReq = 4929; + public static final int QuickUseWidgetRsp = 29966; + public static final int DelBackupAvatarTeamRsp = 7408; + public static final int PersonalLineAllDataReq = 28403; + public static final int PlayerPreEnterMpNotify = 23352; + public static final int QuestTransmitRsp = 2300; + public static final int PrivateChatReq = 24426; + public static final int MistTrialGetChallengeMissionRsp = 22108; + public static final int GetInvestigationMonsterRsp = 21253; + public static final int DealAddFriendReq = 21886; + public static final int GetPlayerAskFriendListReq = 1813; + public static final int EnterSceneDoneRsp = 793; + public static final int ClientLoadingCostumeVerificationNotify = 6382; + public static final int SceneEntityDrownRsp = 1742; + public static final int GetRegionSearchReq = 27191; + public static final int EnterWorldAreaReq = 479; + public static final int SorushWidgetDataNotify = 25889; + public static final int DoGachaRsp = 20937; + public static final int EvtAvatarLockChairReq = 8990; + public static final int MistTrialSelectAvatarAndEnterDungeonReq = 20957; + public static final int AvatarEnterElementViewNotify = 88; + public static final int GetSceneAreaReq = 8189; + public static final int GetShopmallDataRsp = 25192; + public static final int EvtAiSyncCombatThreatInfoNotify = 1442; + public static final int DungeonChallengeBeginNotify = 28604; + public static final int HomeChangeBgmReq = 4543; + public static final int TowerEnterLevelReq = 22746; + public static final int AddQuestContentProgressRsp = 22640; + public static final int PlayerGameTimeByLuaNotify = 2122; + public static final int ServerTimeNotify = 28606; + public static final int GetSceneAreaRsp = 27301; + public static final int FurnitureCurModuleArrangeCountNotify = 21517; + public static final int HomeAvatarRewardEventNotify = 1329; + public static final int TowerGetFloorStarRewardRsp = 21871; + public static final int ScenePlayerInfoNotify = 7477; + public static final int ChapterStateNotify = 25075; + public static final int CodexDataFullNotify = 9784; + public static final int SceneKickPlayerReq = 27213; + public static final int SetPlayerBornDataRsp = 26454; + public static final int AvatarSkillUpgradeReq = 25062; + public static final int AvatarWearFlycloakRsp = 27660; + public static final int EnterSceneDoneReq = 4561; + public static final int TowerLevelEndNotify = 22669; + public static final int ChangeTeamNameRsp = 7491; + public static final int EvtCostStaminaNotify = 1514; + public static final int NpcTalkReq = 24255; + public static final int HomeModuleSeenRsp = 5790; + public static final int MailChangeNotify = 27744; + public static final int AvatarDieAnimationEndRsp = 20675; + public static final int ReliquaryDecomposeRsp = 21659; + public static final int GetActivityInfoRsp = 7719; + public static final int CreateVehicleReq = 9915; + public static final int GetShopmallDataReq = 21348; + public static final int HomeAvatarRewardEventGetRsp = 5969; + public static final int GetFriendShowNameCardInfoRsp = 1685; + public static final int ToTheMoonEnterSceneReq = 6116; + public static final int HomeSceneJumpReq = 5317; + public static final int CombineFormulaDataNotify = 9746; + public static final int GachaWishRsp = 23268; + public static final int GetMapAreaReq = 20412; + public static final int ProudSkillExtraLevelNotify = 28513; + public static final int WorldAllRoutineTypeNotify = 20709; + public static final int TakeFurnitureMakeRsp = 6584; + public static final int HomeGetArrangementInfoReq = 24996; + public static final int SetNameCardReq = 20106; + public static final int SceneInitFinishReq = 377; + public static final int AvatarChangeTraceEffectReq = 28932; + public static final int QuestCreateEntityRsp = 8838; + public static final int ActivityInfoNotify = 29575; + public static final int StoreItemDelNotify = 9567; + public static final int AddNoGachaAvatarCardNotify = 28082; + public static final int TowerAllDataReq = 2265; + public static final int PostEnterSceneRsp = 22743; + public static final int EvtBeingHealedNotify = 26087; + public static final int ForgeStartReq = 29987; + public static final int HomeAvatarRewardEventGetReq = 7571; + public static final int PersonalLineAllDataRsp = 28577; + public static final int ChangeMpTeamAvatarRsp = 28252; + public static final int GetCompoundDataReq = 25870; + public static final int GetAllMailRsp = 22156; + public static final int HitTreeNotify = 20542; + public static final int GetQuestLackingResourceRsp = 27981; + public static final int AvatarPropNotify = 21114; + public static final int TowerGetFloorStarRewardReq = 5963; + public static final int PlayerQuitFromHomeNotify = 3135; + public static final int PlayerRechargeDataNotify = 8039; + public static final int TheaterLobbySceneJumpReq = 27152; + public static final int HomeSaveBlueprintToSlotRsp = 24788; + public static final int HomeTransferReq = 2203; + public static final int AvatarDataNotify = 23378; + public static final int AvatarSkillUpgradeRsp = 7799; + public static final int CoopDataNotify = 25237; + public static final int GetAllMailReq = 26533; + public static final int GetWorldMpInfoReq = 6731; + public static final int AvatarChangeCostumeNotify = 5367; + public static final int QuestDestroyNpcRsp = 23800; + public static final int SetFriendEnterHomeOptionReq = 20740; + public static final int ShowMessageNotify = 4799; + public static final int BrickBreakerSettleNotify = 27585; + public static final int QuestDestroyEntityRsp = 3908; + public static final int GetCityReputationInfoReq = 23347; + public static final int WorldRoutineTypeCloseNotify = 3414; + public static final int GetMailItemReq = 8354; + public static final int GetAreaExplorePointReq = 21085; + public static final int PlantFlowerEditFlowerCombinationReq = 3446; + public static final int PlayerInvestigationTargetNotify = 5321; + public static final int SetPlayerPropReq = 23363; + public static final int CardProductRewardNotify = 4506; + public static final int HideAndSeekSettleNotify = 9112; + public static final int VehicleStaminaNotify = 1047; + public static final int BattlePassChangeRewardPlanRsp = 20530; + public static final int GadgetAutoPickDropInfoNotify = 21438; + public static final int MeetNpcReq = 5799; + public static final int SetPlayerBornDataReq = 25726; + public static final int QuestCreateEntityReq = 21882; + public static final int AvatarFetterLevelRewardReq = 7455; + public static final int ReliquaryUpgradeRsp = 20217; + public static final int AsterMidInfoNotify = 9450; + public static final int ProudSkillChangeNotify = 29262; + public static final int AddQuestContentProgressReq = 20088; + public static final int SceneEntityAppearNotify = 6263; + public static final int GetNextResourceInfoRsp = 20946; + public static final int TowerAllDataRsp = 22979; + public static final int DungeonEntryInfoReq = 6446; + public static final int StartCoopPointReq = 27436; + public static final int BuyGoodsRsp = 21; + public static final int AddFriendNotify = 23316; + public static final int ServerBuffChangeNotify = 21009; + public static final int WorldRoutineChangeNotify = 22801; + public static final int PublishUgcDungeonReq = 26447; + public static final int TryEnterHomeReq = 29384; + public static final int WorldPlayerRTTNotify = 22234; + public static final int GMShowNavMeshRsp = 2319; + public static final int PublishCustomDungeonReq = 808; + public static final int HomeSearchBlueprintRsp = 27454; + public static final int CalcWeaponUpgradeReturnItemsRsp = 6706; + public static final int MiracleRingDeliverItemRsp = 20911; + public static final int LevelupCityReq = 8394; + public static final int CoopChapterUpdateNotify = 6478; + public static final int AvatarGainFlycloakNotify = 6824; + public static final int EntityPropNotify = 4041; + public static final int GetAuthkeyRsp = 154; + public static final int WorldPlayerLocationNotify = 22207; + public static final int WorldDataNotify = 23950; + public static final int PlayerEnterSceneNotify = 3595; + public static final int PlayerGetForceQuitBanInfoRsp = 29159; + public static final int WidgetSlotChangeNotify = 24715; + public static final int SyncTeamEntityNotify = 29231; + public static final int EvtBulletHitNotify = 2465; + public static final int TrialAvatarFirstPassDungeonNotify = 8103; + public static final int ReliquaryUpgradeReq = 24032; + public static final int FishBattleEndRsp = 23385; + public static final int SceneAreaUnlockNotify = 25419; + public static final int SalvagePreventSettleNotify = 26962; + public static final int GetGachaInfoReq = 7728; + public static final int GetMailItemRsp = 9691; + public static final int GetAuthkeyReq = 28308; + public static final int SetPlayerSignatureRsp = 24101; + public static final int TakeBattlePassRewardRsp = 941; + public static final int GetPlayerHomeCompInfoReq = 23660; + public static final int PlayerApplyEnterMpAfterMatchAgreedNotify = 21662; + public static final int ChangeGameTimeReq = 9437; + public static final int BuyGoodsReq = 4523; + public static final int AvatarExpeditionDataNotify = 22907; + public static final int HomeUpdateArrangementInfoReq = 344; + public static final int BatchDelMapMarkReq = 7369; + public static final int PlayerApplyEnterMpResultNotify = 8810; + public static final int BattlePassMissionUpdateNotify = 3190; + public static final int DungeonChallengeFinishNotify = 753; + public static final int TowerFloorRecordChangeNotify = 25333; + public static final int SetUpAvatarTeamRsp = 306; + public static final int PlayerLoginRsp = 27771; + public static final int OrderFinishNotify = 5414; + public static final int MarkMapRsp = 21436; + public static final int RedeemLegendaryKeyRsp = 22912; + public static final int CutSceneEndNotify = 29561; + public static final int PathfindingEnterSceneReq = 2374; + public static final int ClientAIStateNotify = 5471; + public static final int ClientAbilityChangeNotify = 27339; + public static final int PlayerLuaShellNotify = 5224; + public static final int SetNameCardRsp = 27175; + public static final int HomeChangeEditModeReq = 22458; + public static final int McoinExchangeHcoinReq = 5528; + public static final int HomeModuleSeenReq = 24019; + public static final int EvtEntityRenderersChangedNotify = 7358; + public static final int TakeBattlePassMissionPointReq = 6231; + public static final int ShowTemplateReminderNotify = 27975; + public static final int DealAddFriendRsp = 29289; + public static final int AvatarPropChangeReasonNotify = 24920; + public static final int DoGachaReq = 22082; + public static final int WidgetGadgetDataNotify = 380; + public static final int WorldPlayerReviveRsp = 22159; + public static final int PlayerCompoundMaterialReq = 530; + public static final int ForgeQueueDataNotify = 28170; + public static final int AvatarDelNotify = 24313; + public static final int BattlePassCurScheduleUpdateNotify = 1819; + public static final int SceneAvatarStaminaStepRsp = 1653; + public static final int ChangeGameTimeRsp = 29694; + public static final int TowerLevelStarCondNotify = 23130; + public static final int GadgetInteractRsp = 28160; + public static final int GetMapMarkTipsReq = 22105; + public static final int AbilityInvocationsNotify = 4844; + public static final int QuestDestroyNpcReq = 1472; + public static final int MonsterAIConfigHashNotify = 22925; + public static final int EvtAiSyncSkillCdNotify = 28128; + public static final int GetOnlinePlayerListRsp = 9049; + public static final int SkipPlayerGameTimeRsp = 338; + public static final int PlayerStoreNotify = 7845; + public static final int WidgetDoBagReq = 1993; + public static final int AvatarLifeStateChangeNotify = 4653; + public static final int GetOnlinePlayerInfoRsp = 25443; + public static final int DungeonPreloadMonsterNotify = 27900; + public static final int PlayerQuitDungeonRsp = 27043; + public static final int TowerRecordHandbookRsp = 23004; + public static final int PlayerApplyEnterMpResultRsp = 27380; + public static final int EntityAiSyncNotify = 23720; + public static final int HomeAvatarTalkReq = 21992; + public static final int AvatarChangeCostumeRsp = 3408; + public static final int ChooseCurAvatarTeamReq = 29682; + public static final int WeaponPromoteRsp = 25392; + public static final int DungeonPlayerDieNotify = 28876; + public static final int WorldOwnerDailyTaskNotify = 24061; + public static final int AskAddFriendNotify = 5432; + public static final int HomeChangeEditModeRsp = 2916; + public static final int SceneTimeNotify = 29187; + public static final int CookGradeDataNotify = 2574; + public static final int ActivityScheduleInfoNotify = 28401; + public static final int GetOnlinePlayerListReq = 27044; + public static final int EntityFightPropUpdateNotify = 6590; + public static final int ExecuteGadgetLuaReq = 5759; + public static final int RogueDiaryRepairInfoNotify = 1430; + public static final int QuestListNotify = 23350; + public static final int ChangePublishedUgcDungeonSettingRsp = 29062; + public static final int DestroyMaterialReq = 28057; + public static final int TowerTeamSelectReq = 21495; + public static final int GetParentQuestVideoKeyReq = 24330; + public static final int UnlockNameCardNotify = 20229; + public static final int ReadMailNotify = 23556; + public static final int TakeBattlePassMissionPointRsp = 23201; + public static final int EnterSceneReadyRsp = 7914; + public static final int AvatarPromoteGetRewardRsp = 5757; + public static final int GetAllMailNotify = 7646; + public static final int AvatarSkillDepotChangeNotify = 25309; + public static final int PlayerEyePointStateNotify = 576; + public static final int SceneEntityDisappearNotify = 29127; + public static final int QuestUpdateQuestVarReq = 24014; + public static final int ServerUpdateGlobalValueNotify = 1498; + public static final int EnterTrialAvatarActivityDungeonReq = 20982; + public static final int PlayerLogoutReq = 9459; + public static final int TakePlayerLevelRewardRsp = 21700; + public static final int StoreItemChangeNotify = 2646; + public static final int SetFriendRemarkNameRsp = 6029; + public static final int PersonalSceneJumpReq = 25750; + public static final int DungeonDieOptionReq = 4398; + public static final int PushTipsReadFinishRsp = 3285; + public static final int GetPlayerBlacklistReq = 6441; + public static final int DungeonRestartReq = 26792; + public static final int BuyResinRsp = 3981; + public static final int PlayerGetForceQuitBanInfoReq = 29558; + public static final int PersonalSceneJumpRsp = 1612; + public static final int AchievementAllDataNotify = 259; + public static final int DungeonPlayerDieReq = 23261; + public static final int GetProfilePictureDataReq = 22511; + public static final int FinishedParentQuestNotify = 25902; + public static final int GadgetInteractReq = 26009; + public static final int SceneAreaWeatherNotify = 21395; + public static final int PlayerInvestigationAllInfoNotify = 1519; + public static final int GetPlayerMpModeAvailabilityRsp = 25740; + public static final int HomeBasicInfoNotify = 20840; + public static final int GetScenePointRsp = 29349; + public static final int QuestDelNotify = 1774; + public static final int CompoundDataNotify = 5964; + public static final int MassiveEntityElementOpBatchNotify = 29700; + public static final int SetWidgetSlotRsp = 7049; + public static final int PrivateChatNotify = 6396; + public static final int GadgetStateNotify = 21201; + public static final int WorldPlayerReviveReq = 2401; + public static final int WorldPlayerDieNotify = 2689; + public static final int PushTipsChangeNotify = 6833; + public static final int QueryPathRsp = 2350; + public static final int EntityAuthorityChangeNotify = 7710; + public static final int ObstacleModifyNotify = 2384; + public static final int SetPlayerHeadImageReq = 21526; + public static final int ItemAddHintNotify = 26599; + public static final int StartCoopPointRsp = 2147; + public static final int PlayerCookArgsReq = 6593; + public static final int GetFurnitureCurModuleArrangeCountReq = 22795; + public static final int CalcWeaponUpgradeReturnItemsReq = 7713; + public static final int HomeAvatarAllFinishRewardNotify = 9322; + public static final int PlayerCookReq = 192; + public static final int GetPlayerSocialDetailRsp = 1771; + public static final int ToTheMoonQueryPathRsp = 6148; + public static final int TheaterLobbySceneJumpRsp = 25402; + public static final int GetScenePointReq = 23449; + public static final int GroupSuiteNotify = 1962; + public static final int DropItemRsp = 2505; + public static final int ChangeAvatarRsp = 2046; + public static final int SetEntityClientDataNotify = 5306; + public static final int HomeAvatarTalkFinishInfoNotify = 20880; + public static final int GetAreaExplorePointRsp = 29332; + public static final int AvatarEquipAffixStartNotify = 8492; + public static final int TakeoffEquipReq = 24083; + public static final int DungeonDieOptionRsp = 28706; + public static final int SetPlayerHeadImageRsp = 21563; + public static final int ClientAbilityInitFinishNotify = 28413; + public static final int UnlockTransPointReq = 3518; + public static final int PlayerApplyEnterMpNotify = 5245; + public static final int ChangeMpTeamAvatarReq = 28747; + public static final int PlayerApplyEnterMpReq = 4701; + public static final int AvatarUnlockTalentNotify = 28793; + public static final int LevelupCityRsp = 3655; + public static final int AvatarChangeElementTypeReq = 21263; + public static final int DungeonSettleNotify = 8007; + public static final int SceneForceUnlockNotify = 2583; + public static final int GetCompoundDataRsp = 4557; + public static final int GetBlossomBriefInfoListRsp = 27512; + public static final int PlayerDataNotify = 7961; + public static final int MapAreaChangeNotify = 21409; + public static final int ScenePlayerSoundNotify = 1408; + public static final int BattlePassAllDataNotify = 27624; + public static final int WeaponAwakenReq = 20421; + public static final int NpcTalkRsp = 23865; + public static final int PullRecentChatReq = 6977; + public static final int QueryPathReq = 2339; + public static final int SetFriendRemarkNameReq = 29399; + public static final int HomeUpdateArrangementInfoRsp = 25852; + public static final int DelMailRsp = 26121; + public static final int UnlockAvatarTalentRsp = 23185; + public static final int CodexDataUpdateNotify = 27330; + public static final int SetUpAvatarTeamReq = 22244; + public static final int AvatarUpgradeRsp = 512; + public static final int GetPlayerFriendListReq = 21607; + public static final int HomeSceneJumpRsp = 28622; + public static final int AbilityInvocationFailNotify = 9225; + public static final int PlayerLoginReq = 2422; + public static final int TakePlayerLevelRewardReq = 9556; + public static final int CreateVehicleRsp = 22592; + public static final int AvatarFlycloakChangeNotify = 28644; + public static final int PullPrivateChatRsp = 29160; + public static final int BattlePassBuySuccNotify = 21408; + public static final int AvatarDieAnimationEndReq = 943; + public static final int GetQuestLackingResourceReq = 25557; + public static final int AvatarSatiationDataNotify = 4982; + public static final int PlayerReportReq = 27619; + public static final int PlayerCookRsp = 23979; + public static final int AvatarPromoteReq = 21972; + public static final int EvtAvatarLockChairRsp = 5831; + public static final int SceneInitFinishRsp = 24671; + public static final int EffigyChallengeV4PrepareNotify = 25107; + public static final int VehicleInteractReq = 25867; + public static final int WindSeedClientNotify = 9675; + public static final int ViewCodexRsp = 28795; + public static final int CoopRewardUpdateNotify = 3014; + public static final int EvtAvatarUpdateFocusNotify = 28630; + public static final int PlayerChatReq = 21209; + public static final int BattlePassChangeRewardPlanReq = 2925; + public static final int TakeoffEquipRsp = 7489; + public static final int GetPlayerTokenReq = 6013; + public static final int HomeMarkPointNotify = 22396; + public static final int FoundationNotify = 5623; + public static final int PlayerEnterDungeonRsp = 3067; + public static final int UpdatePlayerShowAvatarListRsp = 20659; + public static final int GetHomeExchangeWoodInfoReq = 5768; + public static final int GetAllUnlockNameCardReq = 5009; + public static final int WeaponUpgradeReq = 20908; + public static final int PlayerApplyEnterHomeResultRsp = 21189; + public static final int UseItemRsp = 7672; + public static final int UnionCmdNotify = 9762; + public static final int AskAddFriendRsp = 25067; + public static final int PlayerTimeNotify = 2272; + public static final int AvatarRenameInfoNotify = 6549; + public static final int ForgeFormulaDataNotify = 9617; + public static final int SceneDataNotify = 23046; + public static final int GetShopReq = 4619; + public static final int GetPlayerSocialDetailReq = 3597; + public static final int GetUgcRsp = 3178; + public static final int GetCityHuntingOfferRsp = 7671; + public static final int WindSeedType1Notify = 7486; + public static final int PullRecentChatRsp = 26725; + public static final int AvatarAddNotify = 4216; + public static final int NormalUidOpNotify = 8839; + public static final int SceneTransToPointRsp = 24104; + public static final int PlayerPropChangeNotify = 27937; + public static final int VehicleInteractRsp = 27433; + public static final int BackMyWorldRsp = 23771; + public static final int AddBackupAvatarTeamReq = 23418; + public static final int WorldChestOpenNotify = 2812; + public static final int ToTheMoonEnterSceneRsp = 2333; + public static final int EvtDoSkillSuccNotify = 1941; + public static final int ForgeDataNotify = 20023; + public static final int AsterMidCampInfoNotify = 23516; + public static final int GetPlayerAskFriendListRsp = 3915; + public static final int QuestListUpdateNotify = 3344; + public static final int AvatarFightPropNotify = 287; + public static final int ChatChannelUpdateNotify = 22161; + public static final int HomeComfortInfoNotify = 279; + public static final int QuestGlobalVarNotify = 26464; + public static final int AskAddFriendReq = 23646; + public static final int PlayerEnterSceneInfoNotify = 26700; + public static final int HomeChooseModuleReq = 8855; + public static final int AvatarSkillInfoNotify = 25299; + public static final int ChatChannelInfoNotify = 6555; + public static final int GetWidgetSlotRsp = 5441; + public static final int AvatarUpgradeReq = 1568; + public static final int HitClientTrivialNotify = 25759; + public static final int PlatformStartRouteNotify = 2989; + public static final int SetPlayerNameReq = 9269; + public static final int SceneTeamUpdateNotify = 29107; + public static final int HomeModuleUnlockNotify = 27507; + public static final int BlossomBriefInfoNotify = 26657; + public static final int PlayerWorldSceneInfoListNotify = 8028; + + + + public static final int CookRecipeDataNotify = 582959; public static final int ACCKLIOPBHN = 205; public static final int PlayerEnterMapLayerNotify = 26672; public static final int ACOPFPFIJHN = 6465; @@ -25,14 +650,9 @@ public final class PacketOpcodes { public static final int ANKONNPBGJC = 6619; public static final int AOJPBFBPDNB = 25158; public static final int APPJMEJEKKG = 3898; - public static final int AbilityChangeNotify = 300; - public static final int AbilityInvocationFailNotify = 26730; public static final int AbilityInvocationFixedNotify = 4864; - public static final int AbilityInvocationsNotify = 26313; public static final int AcceptCityReputationRequestReq = 6832; public static final int AcceptCityReputationRequestRsp = 7825; - public static final int AchievementAllDataNotify = 27422; - public static final int AchievementUpdateNotify = 4460; public static final int ActivityAcceptAllGiveGiftReq = 26297; public static final int ActivityAcceptAllGiveGiftRsp = 26260; public static final int ActivityAcceptGiveGiftReq = 25362; @@ -52,13 +672,11 @@ public final class PacketOpcodes { public static final int ActivityGiveFriendGiftReq = 7798; public static final int ActivityGiveFriendGiftRsp = 9446; public static final int ActivityHaveRecvGiftNotify = 20546; - public static final int ActivityInfoNotify = 1246; public static final int ActivityPlayOpenAnimNotify = 4102; public static final int ActivityPushTipsInfoNotify = 22464; public static final int ActivityReadPushTipsReq = 4848; public static final int ActivityReadPushTipsRsp = 5363; public static final int ActivitySaleChangeNotify = 7366; - public static final int ActivityScheduleInfoNotify = 23970; public static final int ActivitySelectAvatarCardReq = 6953; public static final int ActivitySelectAvatarCardRsp = 7203; public static final int ActivitySetGiftWishReq = 24397; @@ -73,20 +691,12 @@ public final class PacketOpcodes { public static final int ActivityTakeWatcherRewardRsp = 2165; public static final int ActivityUpdateWatcherNotify = 20400; public static final int AddAranaraCollectionNotify = 4632; - public static final int AddBackupAvatarTeamReq = 22083; - public static final int AddBackupAvatarTeamRsp = 7930; public static final int AddBlacklistReq = 27236; public static final int AddBlacklistRsp = 4703; - public static final int AddFriendNotify = 2626; - public static final int AddNoGachaAvatarCardNotify = 7037; - public static final int AddQuestContentProgressReq = 3824; - public static final int AddQuestContentProgressRsp = 5514; public static final int AddRandTaskInfoNotify = 29507; public static final int AddSeenMonsterNotify = 26127; public static final int AdjustWorldLevelReq = 8482; - public static final int AdjustWorldLevelRsp = 29945; public static final int AllCoopInfoNotify = 2587; - public static final int AllMarkPointNotify = 2766; public static final int AllSeenMonsterNotify = 7030; public static final int AllShareCDDataNotify = 3440; public static final int AllWidgetBackgroundActiveStateNotify = 4761; @@ -95,80 +705,29 @@ public final class PacketOpcodes { public static final int AnchorPointOpReq = 23096; public static final int AnchorPointOpRsp = 726; public static final int AnimatorForceSetAirMoveNotify = 20049; - public static final int AntiAddictNotify = 23699; public static final int AranaraCollectionDataNotify = 21685; public static final int AreaPlayInfoNotify = 23472; public static final int ArenaChallengeFinishNotify = 20843; - public static final int AskAddFriendNotify = 27323; - public static final int AskAddFriendReq = 9257; - public static final int AskAddFriendRsp = 1146; public static final int AssociateInferenceWordReq = 701; public static final int AssociateInferenceWordRsp = 20449; - public static final int AsterLargeInfoNotify = 8935; - public static final int AsterLittleInfoNotify = 25815; - public static final int AsterMidCampInfoNotify = 21139; - public static final int AsterMidInfoNotify = 6512; public static final int AsterMiscInfoNotify = 7912; - public static final int AsterProgressInfoNotify = 26542; - public static final int AvatarAddNotify = 7458; public static final int AvatarBuffAddNotify = 24005; public static final int AvatarBuffDelNotify = 3202; public static final int AvatarCardChangeReq = 27737; public static final int AvatarCardChangeRsp = 3627; public static final int AvatarChangeAnimHashReq = 4097; public static final int AvatarChangeAnimHashRsp = 27826; - public static final int AvatarChangeCostumeNotify = 22376; - public static final int AvatarChangeCostumeReq = 8840; - public static final int AvatarChangeCostumeRsp = 9148; - public static final int AvatarChangeElementTypeReq = 3696; public static final int AvatarChangeElementTypeRsp = 26227; - public static final int AvatarDataNotify = 29811; - public static final int AvatarDelNotify = 8219; - public static final int AvatarDieAnimationEndReq = 4506; - public static final int AvatarDieAnimationEndRsp = 24745; - public static final int AvatarEnterElementViewNotify = 23736; - public static final int AvatarEquipAffixStartNotify = 21354; - public static final int AvatarEquipChangeNotify = 20682; public static final int AvatarExpeditionAllDataReq = 24160; public static final int AvatarExpeditionAllDataRsp = 3990; public static final int AvatarExpeditionCallBackReq = 22881; public static final int AvatarExpeditionCallBackRsp = 22955; - public static final int AvatarExpeditionDataNotify = 26803; public static final int AvatarExpeditionGetRewardReq = 4847; public static final int AvatarExpeditionGetRewardRsp = 25237; public static final int AvatarExpeditionStartReq = 751; public static final int AvatarExpeditionStartRsp = 28415; - public static final int AvatarFetterDataNotify = 29004; - public static final int AvatarFetterLevelRewardReq = 28996; - public static final int AvatarFetterLevelRewardRsp = 3975; - public static final int AvatarFightPropNotify = 20455; - public static final int AvatarFightPropUpdateNotify = 21000; - public static final int AvatarFlycloakChangeNotify = 23578; public static final int AvatarFollowRouteNotify = 6834; - public static final int AvatarGainCostumeNotify = 24251; - public static final int AvatarGainFlycloakNotify = 29528; - public static final int AvatarLifeStateChangeNotify = 22381; public static final int AvatarPromoteGetRewardReq = 993; - public static final int AvatarPromoteGetRewardRsp = 7336; - public static final int AvatarPromoteReq = 23288; - public static final int AvatarPromoteRsp = 8592; - public static final int AvatarPropChangeReasonNotify = 3637; - public static final int AvatarPropNotify = 5355; - public static final int AvatarRenameInfoNotify = 26468; - public static final int AvatarSatiationDataNotify = 704; - public static final int AvatarSkillChangeNotify = 20893; - public static final int AvatarSkillDepotChangeNotify = 3748; - public static final int AvatarSkillInfoNotify = 29066; - public static final int AvatarSkillMaxChargeCountNotify = 22843; - public static final int AvatarSkillUpgradeReq = 29541; - public static final int AvatarSkillUpgradeRsp = 22584; - public static final int AvatarTeamAllDataNotify = 9854; - public static final int AvatarTeamUpdateNotify = 7828; - public static final int AvatarUnlockTalentNotify = 1805; - public static final int AvatarUpgradeReq = 28204; - public static final int AvatarUpgradeRsp = 24216; - public static final int AvatarWearFlycloakReq = 824; - public static final int AvatarWearFlycloakRsp = 21633; public static final int BAAOCAEGJBP = 22430; public static final int BBLDMLJIAIM = 9880; public static final int BBLFOGIBMGA = 25847; @@ -193,7 +752,6 @@ public final class PacketOpcodes { public static final int BOLCDNOPCFK = 6106; public static final int BPOLCGACIHE = 6228; public static final int BackMyWorldReq = 7284; - public static final int BackMyWorldRsp = 25964; public static final int BackPlayCustomDungeonOfficialReq = 368; public static final int BackPlayCustomDungeonOfficialRsp = 329; public static final int BackRebornGalleryReq = 5152; @@ -217,11 +775,7 @@ public final class PacketOpcodes { public static final int BartenderStartLevelRsp = 27218; public static final int BatchBuyGoodsReq = 6294; public static final int BatchBuyGoodsRsp = 29700; - public static final int BattlePassAllDataNotify = 3474; - public static final int BattlePassBuySuccNotify = 28080; - public static final int BattlePassCurScheduleUpdateNotify = 27464; public static final int BattlePassMissionDelNotify = 21680; - public static final int BattlePassMissionUpdateNotify = 24008; public static final int BeginCameraSceneLookNotify = 27569; public static final int BeginCameraSceneLookWithTemplateNotify = 8774; public static final int BigTalentPointConvertReq = 23728; @@ -243,7 +797,6 @@ public final class PacketOpcodes { public static final int BlessingScanRsp = 23837; public static final int BlitzRushParkourRestartReq = 6829; public static final int BlitzRushParkourRestartRsp = 22318; - public static final int BlossomBriefInfoNotify = 29177; public static final int BlossomChestCreateNotify = 2992; public static final int BlossomChestInfoNotify = 28622; public static final int BonusActivityInfoReq = 29984; @@ -265,16 +818,12 @@ public final class PacketOpcodes { public static final int BrickBreakerSetChangingRsp = 29905; public static final int BrickBreakerSetReadyReq = 3864; public static final int BrickBreakerSetReadyRsp = 21659; - public static final int BrickBreakerSettleNotify = 5789; public static final int BrickBreakerTwiceStartReq = 7000; public static final int BrickBreakerTwiceStartRsp = 25873; public static final int BuoyantCombatSettleNotify = 25655; public static final int BuyBattlePassLevelReq = 20824; public static final int BuyBattlePassLevelRsp = 26570; - public static final int BuyGoodsReq = 8034; - public static final int BuyGoodsRsp = 611; public static final int BuyResinReq = 9368; - public static final int BuyResinRsp = 3650; public static final int CAKPFOKMGEJ = 21770; public static final int CALEMNFCNMO = 23560; public static final int CBIKACKAEHB = 26633; @@ -309,31 +858,18 @@ public final class PacketOpcodes { public static final int COKBMINIAOH = 1045; public static final int CPBCJBADPPD = 6196; public static final int CPLDBPNPOEM = 25795; - public static final int CalcWeaponUpgradeReturnItemsReq = 23232; - public static final int CalcWeaponUpgradeReturnItemsRsp = 24299; public static final int CanUseSkillNotify = 1186; public static final int CancelCityReputationRequestReq = 3312; public static final int CancelCityReputationRequestRsp = 20165; public static final int CancelCoopTaskReq = 27925; public static final int CancelCoopTaskRsp = 26816; public static final int CancelFinishParentQuestNotify = 26708; - public static final int CardProductRewardNotify = 5635; public static final int CataLogFinishedGlobalWatcherAllDataNotify = 6277; public static final int CataLogNewFinishedGlobalWatcherNotify = 28630; - public static final int ChallengeDataNotify = 2864; public static final int ChallengeRecordNotify = 27022; - public static final int ChangeAvatarReq = 23169; - public static final int ChangeAvatarRsp = 22163; public static final int ChangeCustomDungeonRoomReq = 25611; public static final int ChangeCustomDungeonRoomRsp = 23301; - public static final int ChangeGameTimeReq = 27713; - public static final int ChangeGameTimeRsp = 28316; - public static final int ChangeMailStarNotify = 2285; - public static final int ChangeMpTeamAvatarReq = 29260; - public static final int ChangeMpTeamAvatarRsp = 352; public static final int ChangeServerGlobalValueNotify = 2846; - public static final int ChangeTeamNameReq = 24187; - public static final int ChangeTeamNameRsp = 29496; public static final int ChangeWidgetBackgroundActiveStateReq = 23423; public static final int ChangeWidgetBackgroundActiveStateRsp = 1073; public static final int ChangeWorldToSingleModeNotify = 24701; @@ -361,12 +897,9 @@ public final class PacketOpcodes { public static final int ChannellerSlabTakeoffBuffRsp = 9897; public static final int ChannellerSlabWearBuffReq = 2514; public static final int ChannellerSlabWearBuffRsp = 21705; - public static final int ChapterStateNotify = 21508; public static final int CharAmusementSettleNotify = 7004; public static final int ChatChannelDataNotify = 3323; - public static final int ChatChannelInfoNotify = 5319; public static final int ChatChannelShieldNotify = 21066; - public static final int ChatChannelUpdateNotify = 28285; public static final int ChatHistoryNotify = 4425; public static final int CheckAddItemExceedLimitNotify = 24230; public static final int CheckGroupReplacedReq = 29675; @@ -386,34 +919,25 @@ public final class PacketOpcodes { public static final int ChessPickCardRsp = 8256; public static final int ChessPlayerInfoNotify = 3276; public static final int ChessSelectedCardsNotify = 8933; - public static final int ChooseCurAvatarTeamReq = 9406; public static final int ChooseCurAvatarTeamRsp = 4031; public static final int CityReputationDataNotify = 8325; public static final int CityReputationLevelupNotify = 29784; public static final int ClearRoguelikeCurseNotify = 4898; - public static final int ClientAIStateNotify = 6944; - public static final int ClientAbilitiesInitFinishCombineNotify = 7505; - public static final int ClientAbilityChangeNotify = 8174; public static final int ClientAbilityInitBeginNotify = 4046; - public static final int ClientAbilityInitFinishNotify = 8666; public static final int ClientBulletCreateNotify = 4966; public static final int ClientCollectorDataNotify = 20387; public static final int ClientHashDebugNotify = 7727; - public static final int ClientLoadingCostumeVerificationNotify = 21932; public static final int ClientLockGameTimeNotify = 23994; public static final int ClientNewMailNotify = 2769; public static final int ClientPauseNotify = 29272; public static final int ClientReconnectNotify = 650; public static final int ClientRemoveCombatEndModifierNotify = 2142; public static final int ClientReportNotify = 29196; - public static final int ClientScriptEventNotify = 3165; public static final int ClientTransmitReq = 1993; public static final int ClientTransmitRsp = 21025; public static final int ClientTriggerEventNotify = 8879; public static final int CloseCommonTipsNotify = 27695; public static final int ClosedItemNotify = 1446; - public static final int CodexDataFullNotify = 29256; - public static final int CodexDataUpdateNotify = 6551; public static final int CoinCollectCheckDoubleStartPlayReq = 29525; public static final int CoinCollectCheckDoubleStartPlayRsp = 20610; public static final int CoinCollectChooseSkillReq = 5314; @@ -424,29 +948,15 @@ public final class PacketOpcodes { public static final int CoinCollectPrepareReq = 21763; public static final int CoinCollectPrepareRsp = 28970; public static final int CoinCollectPrepareStageNotify = 2218; - public static final int CombatInvocationsNotify = 20271; public static final int CombineDataNotify = 4969; - public static final int CombineFormulaDataNotify = 25832; - public static final int CombineReq = 753; - public static final int CombineRsp = 27346; public static final int CommonPlayerTipsNotify = 27603; - public static final int CompoundDataNotify = 25801; - public static final int CompoundUnlockNotify = 29908; - public static final int CookDataNotify = 25816; - public static final int CookGradeDataNotify = 20583; - public static final int CookRecipeDataNotify = 21778; public static final int CoopCgShowNotify = 26025; public static final int CoopCgUpdateNotify = 25026; - public static final int CoopChapterUpdateNotify = 6932; - public static final int CoopDataNotify = 21157; public static final int CoopPointUpdateNotify = 7401; public static final int CoopProgressUpdateNotify = 29927; - public static final int CoopRewardUpdateNotify = 1034; public static final int CreateMassiveEntityNotify = 27278; public static final int CreateMassiveEntityReq = 24080; public static final int CreateMassiveEntityRsp = 20637; - public static final int CreateVehicleReq = 29875; - public static final int CreateVehicleRsp = 958; public static final int CrystalLinkDungeonInfoNotify = 23068; public static final int CrystalLinkEnterDungeonReq = 26178; public static final int CrystalLinkEnterDungeonRsp = 1502; @@ -456,9 +966,6 @@ public final class PacketOpcodes { public static final int CustomDungeonOfficialNotify = 3645; public static final int CustomDungeonRecoverNotify = 22043; public static final int CustomDungeonUpdateNotify = 8476; - public static final int CutSceneBeginNotify = 418; - public static final int CutSceneEndNotify = 3904; - public static final int CutSceneFinishNotify = 21199; public static final int DAILBGKEPIG = 6998; public static final int DAOOBOPAAEE = 742; public static final int DBKEFCNKCFM = 26547; @@ -495,18 +1002,9 @@ public final class PacketOpcodes { public static final int DailyTaskDataNotify = 9714; public static final int DailyTaskFilterCityReq = 21803; public static final int DailyTaskFilterCityRsp = 8986; - public static final int DailyTaskProgressNotify = 27206; public static final int DailyTaskScoreRewardNotify = 20810; public static final int DailyTaskUnlockedCitiesNotify = 6722; - public static final int DataResVersionNotify = 4819; - public static final int DealAddFriendReq = 25212; - public static final int DealAddFriendRsp = 9178; - public static final int DeathZoneInfoNotify = 25105; public static final int DeathZoneObserveNotify = 29864; - public static final int DelBackupAvatarTeamReq = 9455; - public static final int DelBackupAvatarTeamRsp = 3661; - public static final int DelMailReq = 9893; - public static final int DelMailRsp = 8328; public static final int DelScenePlayTeamEntityNotify = 2438; public static final int DelTeamEntityNotify = 4320; public static final int DeleteFriendNotify = 25517; @@ -514,17 +1012,12 @@ public final class PacketOpcodes { public static final int DeleteFriendRsp = 9786; public static final int DeshretObeliskChestInfoNotify = 22407; public static final int DestroyMassiveEntityNotify = 24517; - public static final int DestroyMaterialReq = 6985; - public static final int DestroyMaterialRsp = 7572; public static final int DigActivityChangeGadgetStateReq = 6858; public static final int DigActivityChangeGadgetStateRsp = 26496; public static final int DigActivityMarkPointChangeNotify = 8406; public static final int DisableRoguelikeTrapNotify = 1027; - public static final int DoGachaReq = 6499; - public static final int DoGachaRsp = 25647; public static final int DoRoguelikeDungeonCardGachaReq = 21709; public static final int DoRoguelikeDungeonCardGachaRsp = 3293; - public static final int DoSetPlayerBornDataNotify = 5710; public static final int DraftGuestReplyInviteNotify = 969; public static final int DraftGuestReplyInviteReq = 2082; public static final int DraftGuestReplyInviteRsp = 5277; @@ -541,9 +1034,6 @@ public final class PacketOpcodes { public static final int DragonSpineChapterOpenNotify = 9487; public static final int DragonSpineChapterProgressChangeNotify = 892; public static final int DragonSpineCoinChangeNotify = 5502; - public static final int DropHintNotify = 1884; - public static final int DropItemReq = 28541; - public static final int DropItemRsp = 25342; public static final int DuelHeartCgEndNotify = 509; public static final int DuelHeartEnterDungeonReq = 26744; public static final int DuelHeartEnterDungeonRsp = 21320; @@ -557,7 +1047,6 @@ public final class PacketOpcodes { public static final int DungeonCandidateTeamCreateReq = 6341; public static final int DungeonCandidateTeamCreateRsp = 22514; public static final int DungeonCandidateTeamDismissNotify = 9931; - public static final int DungeonCandidateTeamInfoNotify = 6824; public static final int DungeonCandidateTeamInviteNotify = 20161; public static final int DungeonCandidateTeamInviteReq = 7822; public static final int DungeonCandidateTeamInviteRsp = 23686; @@ -573,37 +1062,26 @@ public final class PacketOpcodes { public static final int DungeonCandidateTeamSetChangingAvatarRsp = 28831; public static final int DungeonCandidateTeamSetReadyReq = 23358; public static final int DungeonCandidateTeamSetReadyRsp = 28597; - public static final int DungeonChallengeBeginNotify = 8891; - public static final int DungeonChallengeFinishNotify = 5847; public static final int DungeonDataNotify = 7011; - public static final int DungeonDieOptionReq = 3884; - public static final int DungeonDieOptionRsp = 28454; - public static final int DungeonEntryInfoReq = 782; - public static final int DungeonEntryInfoRsp = 28381; public static final int DungeonEntryToBeExploreNotify = 22366; public static final int DungeonFollowNotify = 5420; public static final int DungeonGetStatueDropReq = 22105; public static final int DungeonGetStatueDropRsp = 29858; public static final int DungeonInterruptChallengeReq = 25895; public static final int DungeonInterruptChallengeRsp = 4256; - public static final int DungeonPlayerDieNotify = 28240; - public static final int DungeonPlayerDieReq = 3239; public static final int DungeonPlayerDieRsp = 29888; public static final int DungeonRestartInviteNotify = 29338; public static final int DungeonRestartInviteReplyNotify = 8778; public static final int DungeonRestartInviteReplyReq = 4804; public static final int DungeonRestartInviteReplyRsp = 20035; - public static final int DungeonRestartReq = 29252; public static final int DungeonRestartResultNotify = 22679; public static final int DungeonRestartRsp = 26758; public static final int DungeonReviseLevelNotify = 22297; - public static final int DungeonSettleNotify = 22323; public static final int DungeonShowReminderNotify = 7524; public static final int DungeonSlipRevivePointActivateReq = 8945; public static final int DungeonSlipRevivePointActivateRsp = 1980; public static final int DungeonWayPointActivateReq = 7942; public static final int DungeonWayPointActivateRsp = 21846; - public static final int DungeonWayPointNotify = 27817; public static final int EAAGMGDBHHB = 26222; public static final int EAGFGNNJICL = 27281; public static final int EAJBAEKKONE = 26779; @@ -653,7 +1131,6 @@ public final class PacketOpcodes { public static final int EnterChessDungeonReq = 20080; public static final int EnterChessDungeonRsp = 918; public static final int EnterCustomDungeonReq = 23624; - public static final int EnterCustomDungeonRsp = 22598; public static final int EnterFishingReq = 26577; public static final int EnterFishingRsp = 22129; public static final int EnterFungusFighterPlotDungeonReq = 22446; @@ -667,55 +1144,23 @@ public final class PacketOpcodes { public static final int EnterRogueDiaryDungeonReq = 6423; public static final int EnterRogueDiaryDungeonRsp = 26399; public static final int EnterRoguelikeDungeonNotify = 8336; - public static final int EnterSceneDoneReq = 28690; - public static final int EnterSceneDoneRsp = 24814; - public static final int EnterScenePeerNotify = 21053; - public static final int EnterSceneReadyReq = 5011; - public static final int EnterSceneReadyRsp = 4744; public static final int EnterSceneWeatherAreaNotify = 7317; - public static final int EnterTransPointRegionNotify = 22064; - public static final int EnterTrialAvatarActivityDungeonReq = 7738; public static final int EnterTrialAvatarActivityDungeonRsp = 8751; - public static final int EnterWorldAreaReq = 29482; - public static final int EnterWorldAreaRsp = 21362; public static final int EntityAiKillSelfNotify = 2606; - public static final int EntityAiSyncNotify = 5447; - public static final int EntityAuthorityChangeNotify = 3913; public static final int EntityConfigHashNotify = 20100; - public static final int EntityFightPropChangeReasonNotify = 2489; - public static final int EntityFightPropNotify = 9760; - public static final int EntityFightPropUpdateNotify = 24036; public static final int EntityForceSyncReq = 8671; public static final int EntityForceSyncRsp = 24909; public static final int EntityJumpNotify = 8767; public static final int EntityMoveRoomNotify = 26583; - public static final int EntityPropNotify = 3503; - public static final int EntityTagChangeNotify = 6805; public static final int EquipRoguelikeRuneReq = 5188; public static final int EquipRoguelikeRuneRsp = 3632; - public static final int EvtAiSyncCombatThreatInfoNotify = 7714; - public static final int EvtAiSyncSkillCdNotify = 6471; public static final int EvtAnimatorParameterNotify = 8912; public static final int EvtAnimatorStateChangedNotify = 1539; - public static final int EvtAvatarEnterFocusNotify = 20643; public static final int EvtAvatarExitFocusNotify = 24354; - public static final int EvtAvatarLockChairReq = 23086; - public static final int EvtAvatarLockChairRsp = 26356; - public static final int EvtAvatarSitDownNotify = 23010; - public static final int EvtAvatarStandUpNotify = 8332; - public static final int EvtAvatarUpdateFocusNotify = 8305; - public static final int EvtBeingHealedNotify = 4595; - public static final int EvtBeingHitNotify = 8650; - public static final int EvtBeingHitsCombineNotify = 22445; public static final int EvtBulletDeactiveNotify = 26348; - public static final int EvtBulletHitNotify = 23746; public static final int EvtBulletMoveNotify = 8672; - public static final int EvtCostStaminaNotify = 810; - public static final int EvtCreateGadgetNotify = 22195; public static final int EvtDestroyGadgetNotify = 5833; public static final int EvtDestroyServerGadgetNotify = 23600; - public static final int EvtDoSkillSuccNotify = 8216; - public static final int EvtEntityRenderersChangedNotify = 5525; public static final int EvtEntityStartDieEndNotify = 27889; public static final int EvtFaceToDirNotify = 3850; public static final int EvtFaceToEntityNotify = 28358; @@ -723,7 +1168,6 @@ public final class PacketOpcodes { public static final int EvtRushMoveNotify = 25987; public static final int EvtSetAttackTargetNotify = 9927; public static final int ExclusiveRuleNotify = 1418; - public static final int ExecuteGadgetLuaReq = 5288; public static final int ExecuteGadgetLuaRsp = 1263; public static final int ExecuteGroupTriggerReq = 29357; public static final int ExecuteGroupTriggerRsp = 5015; @@ -732,7 +1176,6 @@ public final class PacketOpcodes { public static final int ExitFishingReq = 5737; public static final int ExitFishingRsp = 4039; public static final int ExitSceneWeatherAreaNotify = 29563; - public static final int ExitTransPointRegionNotify = 2696; public static final int ExpeditionChallengeEnterRegionNotify = 29889; public static final int ExpeditionChallengeFinishedNotify = 7357; public static final int ExpeditionRecallReq = 24533; @@ -776,8 +1219,6 @@ public final class PacketOpcodes { public static final int FinishLanternProjectionRsp = 7181; public static final int FinishMainCoopReq = 20482; public static final int FinishMainCoopRsp = 23766; - public static final int FinishedParentQuestNotify = 27820; - public static final int FinishedParentQuestUpdateNotify = 455; public static final int FinishedTalkIdListNotify = 28424; public static final int FireworksLaunchDataNotify = 2905; public static final int FireworksReformDataNotify = 7551; @@ -786,7 +1227,6 @@ public final class PacketOpcodes { public static final int FishBattleBeginReq = 23596; public static final int FishBattleBeginRsp = 24515; public static final int FishBattleEndReq = 22572; - public static final int FishBattleEndRsp = 2479; public static final int FishBiteReq = 3118; public static final int FishBiteRsp = 653; public static final int FishCastRodReq = 21697; @@ -815,16 +1255,10 @@ public final class PacketOpcodes { public static final int ForceAddPlayerFriendRsp = 6718; public static final int ForceDragAvatarNotify = 2141; public static final int ForceDragBackTransferNotify = 5469; - public static final int ForgeDataNotify = 6813; - public static final int ForgeFormulaDataNotify = 28490; public static final int ForgeGetQueueDataReq = 477; - public static final int ForgeGetQueueDataRsp = 9429; - public static final int ForgeQueueDataNotify = 29143; public static final int ForgeQueueManipulateReq = 25920; public static final int ForgeQueueManipulateRsp = 4194; - public static final int ForgeStartReq = 28979; public static final int ForgeStartRsp = 24460; - public static final int FoundationNotify = 3606; public static final int FoundationReq = 29818; public static final int FoundationRsp = 9097; public static final int FriendInfoChangeNotify = 21775; @@ -846,14 +1280,12 @@ public final class PacketOpcodes { public static final int FungusRenameReq = 29655; public static final int FungusRenameRsp = 5576; public static final int FunitureMakeMakeInfoChangeNotify = 25867; - public static final int FurnitureCurModuleArrangeCountNotify = 2948; public static final int FurnitureMakeBeHelpedNotify = 22219; public static final int FurnitureMakeCancelReq = 29262; public static final int FurnitureMakeCancelRsp = 27277; public static final int FurnitureMakeFinishNotify = 5151; public static final int FurnitureMakeHelpReq = 27122; public static final int FurnitureMakeHelpRsp = 27261; - public static final int FurnitureMakeReq = 23349; public static final int FurnitureMakeRsp = 7783; public static final int FurnitureMakeStartReq = 27509; public static final int FurnitureMakeStartRsp = 21400; @@ -959,7 +1391,6 @@ public final class PacketOpcodes { public static final int GKJAACCGLIH = 1897; public static final int GLCMENCDHDE = 22295; public static final int GMShowNavMeshReq = 2389; - public static final int GMShowNavMeshRsp = 2341; public static final int GMShowObstacleReq = 2365; public static final int GMShowObstacleRsp = 2327; public static final int GOBMIGNKFNB = 9111; @@ -978,22 +1409,16 @@ public final class PacketOpcodes { public static final int GachaActivityUpdateElemNotify = 29407; public static final int GachaOpenWishNotify = 24635; public static final int GachaSimpleInfoNotify = 25366; - public static final int GachaWishReq = 23244; - public static final int GachaWishRsp = 9333; - public static final int GadgetAutoPickDropInfoNotify = 3579; public static final int GadgetChainLevelChangeNotify = 1565; public static final int GadgetChainLevelUpdateNotify = 25220; public static final int GadgetChangeLevelTagReq = 172; public static final int GadgetChangeLevelTagRsp = 9742; public static final int GadgetCustomTreeInfoNotify = 8377; public static final int GadgetGeneralRewardInfoNotify = 7557; - public static final int GadgetInteractReq = 9254; - public static final int GadgetInteractRsp = 29895; public static final int GadgetPlayDataNotify = 29586; public static final int GadgetPlayStartNotify = 1524; public static final int GadgetPlayStopNotify = 29757; public static final int GadgetPlayUidOpNotify = 23635; - public static final int GadgetStateNotify = 2075; public static final int GadgetTalkChangeNotify = 3815; public static final int GalleryBalloonScoreNotify = 25548; public static final int GalleryBalloonShootNotify = 20139; @@ -1010,7 +1435,6 @@ public final class PacketOpcodes { public static final int GalleryStartNotify = 23632; public static final int GalleryStopNotify = 20569; public static final int GallerySumoKillMonsterNotify = 25732; - public static final int GalleryWillStartCountdownNotify = 26134; public static final int GearActivityFinishPlayGearReq = 22818; public static final int GearActivityFinishPlayGearRsp = 4312; public static final int GearActivityFinishPlayPictureReq = 3879; @@ -1019,113 +1443,58 @@ public final class PacketOpcodes { public static final int GearActivityStartPlayGearRsp = 25975; public static final int GearActivityStartPlayPictureReq = 440; public static final int GearActivityStartPlayPictureRsp = 4894; - public static final int GetActivityInfoReq = 25586; - public static final int GetActivityInfoRsp = 7972; public static final int GetActivityScheduleReq = 885; - public static final int GetActivityScheduleRsp = 7421; public static final int GetActivityShopSheetInfoReq = 24121; public static final int GetActivityShopSheetInfoRsp = 4109; public static final int GetAllActivatedBargainDataReq = 22200; public static final int GetAllActivatedBargainDataRsp = 3517; public static final int GetAllH5ActivityInfoReq = 4793; public static final int GetAllH5ActivityInfoRsp = 28822; - public static final int GetAllMailNotify = 24116; - public static final int GetAllMailReq = 29228; - public static final int GetAllMailResultNotify = 5536; - public static final int GetAllMailRsp = 9526; public static final int GetAllSceneGalleryInfoReq = 22232; public static final int GetAllSceneGalleryInfoRsp = 7472; - public static final int GetAllUnlockNameCardReq = 3551; - public static final int GetAllUnlockNameCardRsp = 28550; - public static final int GetAreaExplorePointReq = 20438; - public static final int GetAreaExplorePointRsp = 27637; public static final int GetAuthSalesmanInfoReq = 28580; public static final int GetAuthSalesmanInfoRsp = 8294; - public static final int GetAuthkeyReq = 27875; - public static final int GetAuthkeyRsp = 29353; public static final int GetBargainDataReq = 7358; public static final int GetBargainDataRsp = 8330; public static final int GetBattlePassProductReq = 2201; public static final int GetBattlePassProductRsp = 29703; public static final int GetBlossomBriefInfoListReq = 29592; - public static final int GetBlossomBriefInfoListRsp = 8452; public static final int GetBonusActivityRewardReq = 29874; public static final int GetBonusActivityRewardRsp = 5252; public static final int GetChatEmojiCollectionReq = 25164; public static final int GetChatEmojiCollectionRsp = 21858; public static final int GetCityHuntingOfferReq = 6556; - public static final int GetCityHuntingOfferRsp = 6015; - public static final int GetCityReputationInfoReq = 8549; - public static final int GetCityReputationInfoRsp = 128; public static final int GetCityReputationMapInfoReq = 26582; public static final int GetCityReputationMapInfoRsp = 24830; - public static final int GetCompoundDataReq = 8732; - public static final int GetCompoundDataRsp = 24302; public static final int GetCustomDungeonReq = 24516; public static final int GetCustomDungeonRsp = 5372; public static final int GetDailyDungeonEntryInfoReq = 6924; - public static final int GetDailyDungeonEntryInfoRsp = 674; public static final int GetDungeonEntryExploreConditionReq = 28261; public static final int GetDungeonEntryExploreConditionRsp = 3536; public static final int GetExpeditionAssistInfoListReq = 2643; public static final int GetExpeditionAssistInfoListRsp = 29625; - public static final int GetFriendShowAvatarInfoReq = 3887; - public static final int GetFriendShowAvatarInfoRsp = 26299; public static final int GetFriendShowNameCardInfoReq = 29743; - public static final int GetFriendShowNameCardInfoRsp = 20479; - public static final int GetFurnitureCurModuleArrangeCountReq = 27516; - public static final int GetGachaInfoReq = 181; - public static final int GetGachaInfoRsp = 23881; public static final int GetGameplayRecommendationReq = 29716; public static final int GetGameplayRecommendationRsp = 23992; - public static final int GetHomeExchangeWoodInfoReq = 20885; public static final int GetHomeExchangeWoodInfoRsp = 27659; public static final int GetHomeLevelUpRewardReq = 5653; public static final int GetHomeLevelUpRewardRsp = 7279; public static final int GetHuntingOfferRewardReq = 4392; public static final int GetHuntingOfferRewardRsp = 26705; public static final int GetInvestigationMonsterReq = 23800; - public static final int GetInvestigationMonsterRsp = 23497; - public static final int GetMailItemReq = 5317; - public static final int GetMailItemRsp = 27050; - public static final int GetMapAreaReq = 8758; - public static final int GetMapAreaRsp = 9654; - public static final int GetMapMarkTipsReq = 4445; - public static final int GetMapMarkTipsRsp = 26346; public static final int GetMechanicusInfoReq = 6012; public static final int GetMechanicusInfoRsp = 1507; public static final int GetNextResourceInfoReq = 24599; - public static final int GetNextResourceInfoRsp = 9011; public static final int GetOnlinePlayerInfoReq = 21665; - public static final int GetOnlinePlayerInfoRsp = 8759; - public static final int GetOnlinePlayerListReq = 27587; - public static final int GetOnlinePlayerListRsp = 1234; public static final int GetOpActivityInfoReq = 25823; public static final int GetOpActivityInfoRsp = 24674; - public static final int GetParentQuestVideoKeyReq = 28598; - public static final int GetParentQuestVideoKeyRsp = 5868; - public static final int GetPlayerAskFriendListReq = 3520; - public static final int GetPlayerAskFriendListRsp = 20085; - public static final int GetPlayerBlacklistReq = 25338; - public static final int GetPlayerBlacklistRsp = 20310; - public static final int GetPlayerFriendListReq = 2240; - public static final int GetPlayerFriendListRsp = 20997; - public static final int GetPlayerHomeCompInfoReq = 3709; public static final int GetPlayerMpModeAvailabilityReq = 26251; - public static final int GetPlayerMpModeAvailabilityRsp = 28762; - public static final int GetPlayerSocialDetailReq = 928; - public static final int GetPlayerSocialDetailRsp = 7452; - public static final int GetPlayerTokenReq = 21228; - public static final int GetPlayerTokenRsp = 2407; public static final int GetPushTipsRewardReq = 9818; public static final int GetPushTipsRewardRsp = 1440; - public static final int GetQuestLackingResourceReq = 24145; - public static final int GetQuestLackingResourceRsp = 28297; public static final int GetRecentMpPlayerListReq = 9833; public static final int GetRecentMpPlayerListRsp = 24279; public static final int GetRecommendCustomDungeonReq = 23034; public static final int GetRecommendCustomDungeonRsp = 4300; - public static final int GetRegionSearchReq = 2030; public static final int GetReunionMissionInfoReq = 27824; public static final int GetReunionMissionInfoRsp = 8359; public static final int GetReunionPrivilegeInfoReq = 29305; @@ -1134,18 +1503,10 @@ public final class PacketOpcodes { public static final int GetReunionSignInInfoRsp = 22823; public static final int GetRogueDairyRepairInfoReq = 6887; public static final int GetRogueDairyRepairInfoRsp = 133; - public static final int GetSceneAreaReq = 25175; - public static final int GetSceneAreaRsp = 27029; public static final int GetSceneNpcPositionReq = 24678; public static final int GetSceneNpcPositionRsp = 412; public static final int GetScenePerformanceReq = 3953; public static final int GetScenePerformanceRsp = 25307; - public static final int GetScenePointReq = 23197; - public static final int GetScenePointRsp = 7133; - public static final int GetShopReq = 9681; - public static final int GetShopRsp = 22793; - public static final int GetShopmallDataReq = 2616; - public static final int GetShopmallDataRsp = 1087; public static final int GetSignInRewardReq = 25930; public static final int GetSignInRewardRsp = 27270; public static final int GetStoreCustomDungeonReq = 8591; @@ -1153,19 +1514,12 @@ public final class PacketOpcodes { public static final int GetUgcBriefInfoReq = 4301; public static final int GetUgcBriefInfoRsp = 25183; public static final int GetUgcReq = 3704; - public static final int GetUgcRsp = 29873; - public static final int GetWidgetSlotReq = 24304; - public static final int GetWidgetSlotRsp = 28535; - public static final int GetWorldMpInfoReq = 6964; - public static final int GetWorldMpInfoRsp = 1461; public static final int GiveUpRoguelikeDungeonCardReq = 8630; public static final int GiveUpRoguelikeDungeonCardRsp = 28045; public static final int GivingRecordChangeNotify = 20863; - public static final int GivingRecordNotify = 7258; public static final int GlobalBuildingInfoNotify = 3344; public static final int GmTalkNotify = 8449; public static final int GmTalkReq = 25907; - public static final int GmTalkRsp = 3923; public static final int GrantRewardNotify = 24643; public static final int GravenInnocenceEditCarveCombinationReq = 8110; public static final int GravenInnocenceEditCarveCombinationRsp = 28250; @@ -1179,7 +1533,6 @@ public final class PacketOpcodes { public static final int GroupLinkChangeNotify = 5992; public static final int GroupLinkDeleteNotify = 20325; public static final int GroupLinkMarkUpdateNotify = 7262; - public static final int GroupSuiteNotify = 6257; public static final int GroupUnloadNotify = 27542; public static final int GuestBeginEnterSceneNotify = 2725; public static final int GuestPostEnterSceneNotify = 4310; @@ -1218,46 +1571,23 @@ public final class PacketOpcodes { public static final int HideAndSeekPlayerReadyNotify = 20706; public static final int HideAndSeekPlayerSetAvatarNotify = 27442; public static final int HideAndSeekSelectAvatarReq = 1259; - public static final int HideAndSeekSelectAvatarRsp = 4472; public static final int HideAndSeekSelectSkillReq = 2859; public static final int HideAndSeekSelectSkillRsp = 544; public static final int HideAndSeekSetReadyReq = 24183; public static final int HideAndSeekSetReadyRsp = 27329; - public static final int HideAndSeekSettleNotify = 21206; - public static final int HitClientTrivialNotify = 20211; - public static final int HitTreeNotify = 8766; - public static final int HomeAllUnlockedBgmIdListNotify = 23471; - public static final int HomeAvatarAllFinishRewardNotify = 9497; - public static final int HomeAvatarCostumeChangeNotify = 28208; - public static final int HomeAvatarRewardEventGetReq = 26566; - public static final int HomeAvatarRewardEventGetRsp = 25571; - public static final int HomeAvatarRewardEventNotify = 2640; - public static final int HomeAvatarSummonAllEventNotify = 6401; - public static final int HomeAvatarSummonEventReq = 9238; public static final int HomeAvatarSummonEventRsp = 27614; public static final int HomeAvatarSummonFinishReq = 24791; public static final int HomeAvatarSummonFinishRsp = 8835; - public static final int HomeAvatarTalkFinishInfoNotify = 1817; - public static final int HomeAvatarTalkReq = 22316; - public static final int HomeAvatarTalkRsp = 1147; public static final int HomeAvtarAllFinishRewardNotify = 9713; public static final int HomeBalloonGalleryScoreNotify = 20418; public static final int HomeBalloonGallerySettleNotify = 5349; - public static final int HomeBasicInfoNotify = 4186; public static final int HomeBlockNotify = 20667; public static final int HomeBlueprintInfoNotify = 20806; - public static final int HomeChangeBgmNotify = 2031; - public static final int HomeChangeBgmReq = 28739; public static final int HomeChangeBgmRsp = 6476; - public static final int HomeChangeEditModeReq = 8351; - public static final int HomeChangeEditModeRsp = 7491; public static final int HomeChangeModuleReq = 1750; public static final int HomeChangeModuleRsp = 20550; - public static final int HomeChooseModuleReq = 29914; - public static final int HomeChooseModuleRsp = 20087; public static final int HomeClearGroupRecordReq = 28348; public static final int HomeClearGroupRecordRsp = 21872; - public static final int HomeComfortInfoNotify = 4153; public static final int HomeCreateBlueprintReq = 28484; public static final int HomeCreateBlueprintRsp = 22980; public static final int HomeCustomFurnitureInfoNotify = 7355; @@ -1265,15 +1595,10 @@ public final class PacketOpcodes { public static final int HomeDeleteBlueprintRsp = 2973; public static final int HomeEditCustomFurnitureReq = 27340; public static final int HomeEditCustomFurnitureRsp = 23160; - public static final int HomeEnterEditModeFinishReq = 4149; - public static final int HomeEnterEditModeFinishRsp = 21433; public static final int HomeExchangeWoodReq = 20572; public static final int HomeExchangeWoodRsp = 1815; public static final int HomeFishFarmingInfoNotify = 136; public static final int HomeGalleryInPlayingNotify = 20552; - public static final int HomeGetArrangementInfoReq = 22421; - public static final int HomeGetArrangementInfoRsp = 24303; - public static final int HomeGetBasicInfoReq = 27734; public static final int HomeGetBlueprintSlotInfoReq = 2811; public static final int HomeGetBlueprintSlotInfoRsp = 6723; public static final int HomeGetFishFarmingInfoReq = 21521; @@ -1291,11 +1616,6 @@ public final class PacketOpcodes { public static final int HomeLimitedShopInfoChangeNotify = 22844; public static final int HomeLimitedShopInfoNotify = 25226; public static final int HomeLimitedShopInfoReq = 23396; - public static final int HomeLimitedShopInfoRsp = 8746; - public static final int HomeMarkPointNotify = 23013; - public static final int HomeModuleSeenReq = 27692; - public static final int HomeModuleSeenRsp = 3944; - public static final int HomeModuleUnlockNotify = 811; public static final int HomeNewUnlockedBgmIdListNotify = 1089; public static final int HomePictureFrameInfoNotify = 24256; public static final int HomePlantFieldNotify = 5595; @@ -1306,7 +1626,6 @@ public final class PacketOpcodes { public static final int HomePlantSeedRsp = 9241; public static final int HomePlantWeedReq = 20037; public static final int HomePlantWeedRsp = 2656; - public static final int HomePreChangeEditModeNotify = 27578; public static final int HomePreviewBlueprintReq = 4668; public static final int HomePreviewBlueprintRsp = 23117; public static final int HomePriorCheckNotify = 1456; @@ -1320,27 +1639,20 @@ public final class PacketOpcodes { public static final int HomeSaveArrangementNoChangeRsp = 20696; public static final int HomeSceneInitFinishReq = 27778; public static final int HomeSceneInitFinishRsp = 9038; - public static final int HomeSceneJumpReq = 2482; - public static final int HomeSceneJumpRsp = 22825; public static final int HomeScenePointFishFarmingInfoNotify = 1346; public static final int HomeSearchBlueprintReq = 1240; - public static final int HomeSearchBlueprintRsp = 9491; public static final int HomeSeekFurnitureGalleryScoreNotify = 9976; public static final int HomeSetBlueprintFriendOptionReq = 5246; public static final int HomeSetBlueprintFriendOptionRsp = 3981; public static final int HomeSetBlueprintSlotOptionReq = 1990; public static final int HomeSetBlueprintSlotOptionRsp = 26409; - public static final int HomeTransferReq = 28287; public static final int HomeTransferRsp = 5429; - public static final int HomeUpdateArrangementInfoReq = 4976; - public static final int HomeUpdateArrangementInfoRsp = 28545; public static final int HomeUpdateFishFarmingInfoReq = 25936; public static final int HomeUpdateFishFarmingInfoRsp = 28093; public static final int HomeUpdatePictureFrameInfoReq = 5532; public static final int HomeUpdatePictureFrameInfoRsp = 5740; public static final int HomeUpdateScenePointFishFarmingInfoReq = 201; public static final int HomeUpdateScenePointFishFarmingInfoRsp = 7736; - public static final int HostPlayerNotify = 9459; public static final int HuntingFailNotify = 22800; public static final int HuntingGiveUpReq = 2156; public static final int HuntingGiveUpRsp = 5719; @@ -1415,7 +1727,6 @@ public final class PacketOpcodes { public static final int IslandPartyRaftInfoNotify = 5989; public static final int IslandPartySailInfoNotify = 8726; public static final int IslandPartySettleNotify = 23083; - public static final int ItemAddHintNotify = 20755; public static final int ItemCdGroupTimeNotify = 21839; public static final int ItemGivingReq = 4527; public static final int ItemGivingRsp = 7103; @@ -1526,9 +1837,6 @@ public final class PacketOpcodes { public static final int LeaveSceneRsp = 25971; public static final int LeaveWorldNotify = 22405; public static final int LevelTagDataNotify = 4502; - public static final int LevelupCityReq = 8097; - public static final int LevelupCityRsp = 9797; - public static final int LifeStateChangeNotify = 25474; public static final int LikeCustomDungeonReq = 6450; public static final int LikeCustomDungeonRsp = 9496; public static final int LiveEndNotify = 24015; @@ -1565,21 +1873,14 @@ public final class PacketOpcodes { public static final int MNNNLMGHOFG = 28641; public static final int MPIEGBJMCII = 26609; public static final int MPPBFLIIAOM = 28429; - public static final int MailChangeNotify = 7569; public static final int MainCoopFailNotify = 2503; public static final int MainCoopUpdateNotify = 1415; - public static final int MapAreaChangeNotify = 21970; public static final int MarkEntityInMinMapNotify = 315; - public static final int MarkMapReq = 1812; - public static final int MarkMapRsp = 28945; public static final int MarkNewNotify = 26228; public static final int MarkTargetInvestigationMonsterNotify = 21010; - public static final int MassiveEntityElementOpBatchNotify = 699; public static final int MassiveEntityStateChangedNotify = 21761; public static final int MaterialDeleteReturnNotify = 6719; public static final int MaterialDeleteUpdateNotify = 9737; - public static final int McoinExchangeHcoinReq = 29611; - public static final int McoinExchangeHcoinRsp = 21323; public static final int MechanicusCandidateTeamCreateReq = 28997; public static final int MechanicusCandidateTeamCreateRsp = 29756; public static final int MechanicusCloseNotify = 25277; @@ -1590,7 +1891,6 @@ public final class PacketOpcodes { public static final int MechanicusSequenceOpenNotify = 9692; public static final int MechanicusUnlockGearReq = 25222; public static final int MechanicusUnlockGearRsp = 27878; - public static final int MeetNpcReq = 25501; public static final int MeetNpcRsp = 25074; public static final int MetNpcIdListNotify = 28244; public static final int MichiaeMatsuriDarkPressureLevelUpdateNotify = 29941; @@ -1607,7 +1907,6 @@ public final class PacketOpcodes { public static final int MichiaeMatsuriUnlockCrystalSkillRsp = 22931; public static final int MiracleRingDataNotify = 3064; public static final int MiracleRingDeliverItemReq = 28950; - public static final int MiracleRingDeliverItemRsp = 20932; public static final int MiracleRingDestroyNotify = 8260; public static final int MiracleRingDropResultNotify = 7312; public static final int MiracleRingTakeRewardReq = 29462; @@ -1615,17 +1914,12 @@ public final class PacketOpcodes { public static final int MistTrialDunegonFailNotify = 9722; public static final int MistTrialFloorLevelNotify = 9166; public static final int MistTrialGetChallengeMissionReq = 28736; - public static final int MistTrialGetChallengeMissionRsp = 23092; public static final int MistTrialGetDungeonExhibitionDataReq = 29891; public static final int MistTrialGetDungeonExhibitionDataRsp = 2046; - public static final int MistTrialSelectAvatarAndEnterDungeonReq = 29677; public static final int MistTrialSelectAvatarAndEnterDungeonRsp = 24511; public static final int MistTrialSettleNotify = 28242; - public static final int MonsterAIConfigHashNotify = 1317; - public static final int MonsterAlertChangeNotify = 20036; public static final int MonsterForceAlertNotify = 3111; public static final int MonsterPointArrayRouteUpdateNotify = 28752; - public static final int MonsterSummonTagNotify = 26800; public static final int MpBlockNotify = 27749; public static final int MpPlayGuestReplyInviteReq = 9875; public static final int MpPlayGuestReplyInviteRsp = 107; @@ -1641,7 +1935,6 @@ public final class PacketOpcodes { public static final int MultistagePlayEndNotify = 5212; public static final int MultistagePlayFinishStageReq = 20554; public static final int MultistagePlayFinishStageRsp = 672; - public static final int MultistagePlayInfoNotify = 7198; public static final int MultistagePlaySettleNotify = 24122; public static final int MultistagePlayStageEndNotify = 3019; public static final int MuqadasPotionActivityEnterDungeonReq = 24954; @@ -1651,7 +1944,6 @@ public final class PacketOpcodes { public static final int MuqadasPotionDungeonSettleNotify = 2813; public static final int MuqadasPotionRestartDungeonReq = 7410; public static final int MuqadasPotionRestartDungeonRsp = 7227; - public static final int MusicGameSettleReq = 24309; public static final int MusicGameSettleRsp = 7327; public static final int MusicGameStartReq = 2690; public static final int MusicGameStartRsp = 6458; @@ -1691,9 +1983,6 @@ public final class PacketOpcodes { public static final int NicknameAuditConfigNotify = 22648; public static final int NightCrowGadgetObservationMatchReq = 8693; public static final int NightCrowGadgetObservationMatchRsp = 3213; - public static final int NormalUidOpNotify = 23286; - public static final int NpcTalkReq = 3174; - public static final int NpcTalkRsp = 3890; public static final int NpcTalkStateNotify = 943; public static final int OBEDAFIDGEE = 20912; public static final int OBGDOGEFFJO = 25946; @@ -1713,19 +2002,13 @@ public final class PacketOpcodes { public static final int OMHCJJJOCMC = 21924; public static final int ONKDBNHDBIP = 4157; public static final int ONMIAIGDACA = 24452; - public static final int ObstacleModifyNotify = 2314; public static final int OfferingInteractReq = 4106; public static final int OfferingInteractRsp = 21253; public static final int OneoffGatherPointDetectorDataNotify = 2925; public static final int OpActivityDataNotify = 7676; public static final int OpActivityStateNotify = 24977; public static final int OpActivityUpdateNotify = 24399; - public static final int OpenBlossomCircleCampGuideNotify = 4362; - public static final int OpenStateChangeNotify = 5778; - public static final int OpenStateUpdateNotify = 9279; public static final int OrderDisplayNotify = 595; - public static final int OrderFinishNotify = 26680; - public static final int OtherPlayerEnterHomeNotify = 25817; public static final int OutStuckCustomDungeonReq = 8657; public static final int OutStuckCustomDungeonRsp = 9580; public static final int PAFMFPNAFGD = 29376; @@ -1760,28 +2043,20 @@ public final class PacketOpcodes { public static final int PSPlayerApplyEnterMpReq = 3109; public static final int PSPlayerApplyEnterMpRsp = 21696; public static final int ParentQuestInferenceDataNotify = 24796; - public static final int PathfindingEnterSceneReq = 2347; public static final int PathfindingEnterSceneRsp = 2373; public static final int PathfindingPingNotify = 2311; public static final int PerformOperationNotify = 373; public static final int PersistentDungeonSwitchAvatarReq = 8425; public static final int PersistentDungeonSwitchAvatarRsp = 7969; - public static final int PersonalLineAllDataReq = 9323; - public static final int PersonalLineAllDataRsp = 20607; public static final int PersonalLineNewUnlockNotify = 8744; - public static final int PersonalSceneJumpReq = 20938; - public static final int PersonalSceneJumpRsp = 26151; public static final int PhotoActivityClientViewReq = 21878; public static final int PhotoActivityClientViewRsp = 20737; public static final int PhotoActivityFinishReq = 26014; public static final int PhotoActivityFinishRsp = 25296; - public static final int PingReq = 5285; - public static final int PingRsp = 8231; public static final int PlantFlowerAcceptAllGiveFlowerReq = 27784; public static final int PlantFlowerAcceptAllGiveFlowerRsp = 5535; public static final int PlantFlowerAcceptGiveFlowerReq = 27522; public static final int PlantFlowerAcceptGiveFlowerRsp = 26652; - public static final int PlantFlowerEditFlowerCombinationReq = 25884; public static final int PlantFlowerEditFlowerCombinationRsp = 5492; public static final int PlantFlowerGetCanGiveFriendFlowerReq = 21688; public static final int PlantFlowerGetCanGiveFriendFlowerRsp = 2946; @@ -1799,68 +2074,31 @@ public final class PacketOpcodes { public static final int PlantFlowerTakeSeedRewardReq = 23356; public static final int PlantFlowerTakeSeedRewardRsp = 28953; public static final int PlatformChangeRouteNotify = 8048; - public static final int PlatformStartRouteNotify = 7427; public static final int PlatformStopRouteNotify = 27462; public static final int PlayerAllowEnterMpAfterAgreeMatchNotify = 2971; public static final int PlayerApplyEnterHomeNotify = 26047; - public static final int PlayerApplyEnterHomeResultNotify = 26518; public static final int PlayerApplyEnterHomeResultReq = 20101; - public static final int PlayerApplyEnterHomeResultRsp = 5358; - public static final int PlayerApplyEnterMpAfterMatchAgreedNotify = 9475; - public static final int PlayerApplyEnterMpNotify = 5296; - public static final int PlayerApplyEnterMpReq = 9629; - public static final int PlayerApplyEnterMpResultNotify = 3467; - public static final int PlayerApplyEnterMpResultReq = 24849; - public static final int PlayerApplyEnterMpResultRsp = 6395; - public static final int PlayerApplyEnterMpRsp = 20994; public static final int PlayerCancelMatchReq = 9117; public static final int PlayerCancelMatchRsp = 4875; public static final int PlayerChatCDNotify = 26350; - public static final int PlayerChatNotify = 9541; - public static final int PlayerChatReq = 23230; public static final int PlayerChatRsp = 27239; public static final int PlayerCompoundMaterialBoostReq = 26353; public static final int PlayerCompoundMaterialBoostRsp = 26999; - public static final int PlayerCompoundMaterialReq = 7541; - public static final int PlayerCompoundMaterialRsp = 25784; public static final int PlayerConfirmMatchReq = 1167; public static final int PlayerConfirmMatchRsp = 21369; - public static final int PlayerCookArgsReq = 7878; public static final int PlayerCookArgsRsp = 9840; - public static final int PlayerCookReq = 27404; - public static final int PlayerCookRsp = 1250; - public static final int PlayerDataNotify = 2051; public static final int PlayerDeathZoneNotify = 4058; - public static final int PlayerEnterDungeonReq = 28791; - public static final int PlayerEnterDungeonRsp = 24874; - public static final int PlayerEnterSceneInfoNotify = 27063; - public static final int PlayerEnterSceneNotify = 2783; - public static final int PlayerEyePointStateNotify = 27367; public static final int PlayerFishingDataNotify = 6317; - public static final int PlayerForceExitReq = 1819; public static final int PlayerForceExitRsp = 22773; public static final int PlayerGCGMatchConfirmNotify = 5393; public static final int PlayerGCGMatchDismissNotify = 28090; - public static final int PlayerGameTimeByLuaNotify = 3419; - public static final int PlayerGameTimeNotify = 22433; public static final int PlayerGeneralMatchConfirmNotify = 1380; public static final int PlayerGeneralMatchDismissNotify = 2964; - public static final int PlayerGetForceQuitBanInfoReq = 24478; - public static final int PlayerGetForceQuitBanInfoRsp = 8368; - public static final int PlayerHomeCompInfoNotify = 365; public static final int PlayerInjectFixNotify = 27662; - public static final int PlayerInvestigationAllInfoNotify = 23777; - public static final int PlayerInvestigationNotify = 22886; - public static final int PlayerInvestigationTargetNotify = 1218; public static final int PlayerIpRegionNotify = 1074; public static final int PlayerLevelRewardUpdateNotify = 3756; - public static final int PlayerLoginReq = 25842; - public static final int PlayerLoginRsp = 29665; public static final int PlayerLogoutNotify = 9133; - public static final int PlayerLogoutReq = 5347; public static final int PlayerLogoutRsp = 24757; - public static final int PlayerLuaShellNotify = 29883; - public static final int PlayerMatchAgreedResultNotify = 29150; public static final int PlayerMatchInfoNotify = 6049; public static final int PlayerMatchStopNotify = 5482; public static final int PlayerMatchSuccNotify = 29434; @@ -1869,35 +2107,19 @@ public final class PacketOpcodes { public static final int PlayerOfferingDataNotify = 22150; public static final int PlayerOfferingReq = 43; public static final int PlayerOfferingRsp = 9486; - public static final int PlayerPreEnterMpNotify = 23905; - public static final int PlayerPropChangeNotify = 24729; - public static final int PlayerPropChangeReasonNotify = 28241; - public static final int PlayerPropNotify = 7058; - public static final int PlayerQuitDungeonReq = 20980; - public static final int PlayerQuitDungeonRsp = 4431; - public static final int PlayerQuitFromHomeNotify = 27102; public static final int PlayerQuitFromMpNotify = 20263; public static final int PlayerRandomCookReq = 7190; public static final int PlayerRandomCookRsp = 9489; - public static final int PlayerRechargeDataNotify = 9891; - public static final int PlayerReportReq = 28063; public static final int PlayerReportRsp = 3564; public static final int PlayerRoutineDataNotify = 29752; public static final int PlayerSetLanguageReq = 27872; public static final int PlayerSetLanguageRsp = 21982; public static final int PlayerSetOnlyMPWithPSPlayerReq = 5396; public static final int PlayerSetOnlyMPWithPSPlayerRsp = 25610; - public static final int PlayerSetPauseReq = 4448; - public static final int PlayerSetPauseRsp = 1771; public static final int PlayerSignatureAuditDataNotify = 24855; public static final int PlayerSignatureNotify = 22738; public static final int PlayerStartMatchReq = 27823; public static final int PlayerStartMatchRsp = 21172; - public static final int PlayerStoreNotify = 4667; - public static final int PlayerTimeNotify = 9057; - public static final int PlayerWorldSceneInfoListNotify = 7017; - public static final int PostEnterSceneReq = 5606; - public static final int PostEnterSceneRsp = 7880; public static final int PotionEnterDungeonNotify = 21097; public static final int PotionEnterDungeonReq = 4073; public static final int PotionEnterDungeonRsp = 7418; @@ -1907,56 +2129,22 @@ public final class PacketOpcodes { public static final int PotionRestartDungeonRsp = 4156; public static final int PotionSaveDungeonResultReq = 9617; public static final int PotionSaveDungeonResultRsp = 4568; - public static final int PrivateChatNotify = 29471; - public static final int PrivateChatReq = 8163; public static final int PrivateChatRsp = 4033; public static final int ProfilePictureChangeNotify = 5763; public static final int ProjectorOptionReq = 5441; public static final int ProjectorOptionRsp = 919; - public static final int ProudSkillChangeNotify = 23429; - public static final int ProudSkillExtraLevelNotify = 5863; public static final int ProudSkillUpgradeReq = 21290; public static final int ProudSkillUpgradeRsp = 8300; - public static final int PublishCustomDungeonReq = 21897; public static final int PublishCustomDungeonRsp = 20498; public static final int PublishUgcReq = 21198; public static final int PublishUgcRsp = 27453; - public static final int PullPrivateChatReq = 22346; - public static final int PullPrivateChatRsp = 4681; - public static final int PullRecentChatReq = 23337; - public static final int PullRecentChatRsp = 308; - public static final int PushTipsAllDataNotify = 28129; - public static final int PushTipsChangeNotify = 29035; - public static final int PushTipsReadFinishReq = 1612; - public static final int PushTipsReadFinishRsp = 27947; - public static final int QueryCodexMonsterBeKilledNumReq = 24690; public static final int QueryCodexMonsterBeKilledNumRsp = 9121; - public static final int QueryPathReq = 2359; - public static final int QueryPathRsp = 2319; - public static final int QuestCreateEntityReq = 8019; - public static final int QuestCreateEntityRsp = 4869; - public static final int QuestDelNotify = 29185; - public static final int QuestDestroyEntityReq = 21308; - public static final int QuestDestroyEntityRsp = 9130; - public static final int QuestDestroyNpcReq = 26568; - public static final int QuestDestroyNpcRsp = 607; - public static final int QuestGlobalVarNotify = 23502; - public static final int QuestListNotify = 29451; - public static final int QuestListUpdateNotify = 22114; - public static final int QuestProgressUpdateNotify = 5388; public static final int QuestRenameAvatarReq = 1366; public static final int QuestRenameAvatarRsp = 21481; - public static final int QuestTransmitReq = 2854; - public static final int QuestTransmitRsp = 20137; public static final int QuestUpdateQuestTimeVarNotify = 28219; - public static final int QuestUpdateQuestVarNotify = 1753; - public static final int QuestUpdateQuestVarReq = 28126; - public static final int QuestUpdateQuestVarRsp = 5677; public static final int QuickOpenActivityReq = 3073; public static final int QuickOpenActivityRsp = 7953; public static final int QuickUseWidgetReq = 4406; - public static final int QuickUseWidgetRsp = 24972; - public static final int ReadMailNotify = 6739; public static final int ReadNicknameAuditReq = 8131; public static final int ReadNicknameAuditRsp = 29628; public static final int ReadPrivateChatReq = 5538; @@ -1968,7 +2156,6 @@ public final class PacketOpcodes { public static final int RechargeReq = 3184; public static final int RechargeRsp = 22287; public static final int RedeemLegendaryKeyReq = 8427; - public static final int RedeemLegendaryKeyRsp = 7270; public static final int ReformFireworksReq = 28941; public static final int ReformFireworksRsp = 8112; public static final int RefreshBackgroundAvatarReq = 29491; @@ -1979,17 +2166,11 @@ public final class PacketOpcodes { public static final int RefreshRoguelikeDungeonCardReq = 23467; public static final int RefreshRoguelikeDungeonCardRsp = 7915; public static final int RegionSearchChangeRegionNotify = 28838; - public static final int RegionSearchNotify = 26579; public static final int RegionalPlayInfoNotify = 4556; - public static final int ReliquaryDecomposeReq = 2906; - public static final int ReliquaryDecomposeRsp = 5943; public static final int ReliquaryFilterStateNotify = 6547; public static final int ReliquaryFilterStateSaveNotify = 4815; public static final int ReliquaryPromoteReq = 29241; public static final int ReliquaryPromoteRsp = 28265; - public static final int ReliquaryUpgradeReq = 1702; - public static final int ReliquaryUpgradeRsp = 25485; - public static final int RemotePlayerWidgetNotify = 20779; public static final int RemoveBlacklistReq = 850; public static final int RemoveBlacklistRsp = 22319; public static final int RemoveCustomDungeonReq = 24046; @@ -2006,7 +2187,6 @@ public final class PacketOpcodes { public static final int ResetRogueDiaryPlayReq = 3800; public static final int ResetRogueDiaryPlayRsp = 28628; public static final int ResinCardDataUpdateNotify = 6072; - public static final int ResinChangeNotify = 21937; public static final int RestartCoinCollectPlaySingleModeReq = 1251; public static final int RestartCoinCollectPlaySingleModeRsp = 1628; public static final int RestartEffigyChallengeReq = 8574; @@ -2026,7 +2206,6 @@ public final class PacketOpcodes { public static final int RogueDiaryCoinAddNotify = 21318; public static final int RogueDiaryDungeonInfoNotify = 1309; public static final int RogueDiaryDungeonSettleNotify = 27081; - public static final int RogueDiaryRepairInfoNotify = 9164; public static final int RogueDiaryReviveAvatarReq = 26124; public static final int RogueDiaryReviveAvatarRsp = 4056; public static final int RogueDiaryTiredAvatarNotify = 24388; @@ -2064,7 +2243,6 @@ public final class PacketOpcodes { public static final int SalvageEscortSettleNotify = 28329; public static final int SalvagePreventRestartReq = 22494; public static final int SalvagePreventRestartRsp = 26886; - public static final int SalvagePreventSettleNotify = 24588; public static final int SaveCoopDialogReq = 24551; public static final int SaveCoopDialogRsp = 8107; public static final int SaveCustomDungeonRoomReq = 7311; @@ -2073,35 +2251,20 @@ public final class PacketOpcodes { public static final int SaveMainCoopRsp = 27766; public static final int SaveUgcReq = 4331; public static final int SaveUgcRsp = 27821; - public static final int SceneAreaUnlockNotify = 9869; - public static final int SceneAreaWeatherNotify = 25752; - public static final int SceneAudioNotify = 4490; - public static final int SceneAvatarStaminaStepReq = 543; - public static final int SceneAvatarStaminaStepRsp = 28639; public static final int SceneCreateEntityReq = 28428; public static final int SceneCreateEntityRsp = 3079; - public static final int SceneDataNotify = 29478; public static final int SceneDestroyEntityReq = 23998; public static final int SceneDestroyEntityRsp = 2500; public static final int SceneEntitiesMoveCombineNotify = 26073; public static final int SceneEntitiesMovesReq = 20585; - public static final int SceneEntitiesMovesRsp = 8605; - public static final int SceneEntityAppearNotify = 24016; - public static final int SceneEntityDisappearNotify = 1787; public static final int SceneEntityDrownReq = 22277; - public static final int SceneEntityDrownRsp = 23727; public static final int SceneEntityMoveNotify = 25367; public static final int SceneEntityMoveReq = 26916; public static final int SceneEntityMoveRsp = 20380; public static final int SceneEntityUpdateNotify = 27983; - public static final int SceneForceLockNotify = 7079; - public static final int SceneForceUnlockNotify = 3275; public static final int SceneGalleryInfoNotify = 5587; public static final int SceneGalleryVintageHuntingSettleNotify = 5258; - public static final int SceneInitFinishReq = 6923; - public static final int SceneInitFinishRsp = 3805; public static final int SceneKickPlayerNotify = 28326; - public static final int SceneKickPlayerReq = 29095; public static final int SceneKickPlayerRsp = 27200; public static final int ScenePlayBattleInfoListNotify = 20081; public static final int ScenePlayBattleInfoNotify = 1543; @@ -2120,16 +2283,7 @@ public final class PacketOpcodes { public static final int ScenePlayOwnerStartInviteReq = 5530; public static final int ScenePlayOwnerStartInviteRsp = 22034; public static final int ScenePlayerBackgroundAvatarRefreshNotify = 23971; - public static final int ScenePlayerInfoNotify = 23510; - public static final int ScenePlayerLocationNotify = 29652; - public static final int ScenePlayerSoundNotify = 20293; - public static final int ScenePointUnlockNotify = 5431; public static final int SceneRouteChangeNotify = 9691; - public static final int SceneTeamUpdateNotify = 4509; - public static final int SceneTimeNotify = 21694; - public static final int SceneTransToPointReq = 26498; - public static final int SceneTransToPointRsp = 28443; - public static final int SceneWeatherForcastReq = 27174; public static final int SceneWeatherForcastRsp = 4766; public static final int SeaLampCoinNotify = 8079; public static final int SeaLampContributeItemReq = 6321; @@ -2155,21 +2309,12 @@ public final class PacketOpcodes { public static final int SelectEffigyChallengeConditionRsp = 3284; public static final int SelectRoguelikeDungeonCardReq = 20123; public static final int SelectRoguelikeDungeonCardRsp = 24868; - public static final int SelectWorktopOptionReq = 24949; - public static final int SelectWorktopOptionRsp = 27194; - public static final int ServerAnnounceNotify = 7548; public static final int ServerAnnounceRevokeNotify = 23231; - public static final int ServerBuffChangeNotify = 6462; public static final int ServerCombatEndNotify = 5895; public static final int ServerCondMeetQuestListUpdateNotify = 29009; - public static final int ServerDisconnectClientNotify = 22635; - public static final int ServerGlobalValueChangeNotify = 28698; public static final int ServerLogNotify = 7350; public static final int ServerMessageNotify = 20880; - public static final int ServerTimeNotify = 21404; public static final int ServerTryCancelGeneralMatchNotify = 7158; - public static final int ServerUpdateGlobalValueNotify = 1181; - public static final int SetBattlePassViewedReq = 7320; public static final int SetBattlePassViewedRsp = 25281; public static final int SetChatEmojiCollectionReq = 21632; public static final int SetChatEmojiCollectionRsp = 2098; @@ -2179,47 +2324,19 @@ public final class PacketOpcodes { public static final int SetCoopChapterViewedRsp = 23389; public static final int SetCurExpeditionChallengeIdReq = 20340; public static final int SetCurExpeditionChallengeIdRsp = 24543; - public static final int SetEntityClientDataNotify = 1139; - public static final int SetEquipLockStateReq = 8002; - public static final int SetEquipLockStateRsp = 2517; - public static final int SetFriendEnterHomeOptionReq = 26896; public static final int SetFriendEnterHomeOptionRsp = 21101; - public static final int SetFriendRemarkNameReq = 1521; - public static final int SetFriendRemarkNameRsp = 25535; public static final int SetH5ActivityRedDotTimestampReq = 21249; public static final int SetH5ActivityRedDotTimestampRsp = 22816; public static final int SetIsAutoUnlockSpecificEquipReq = 24611; public static final int SetIsAutoUnlockSpecificEquipRsp = 23704; public static final int SetLimitOptimizationNotify = 3723; - public static final int SetNameCardReq = 3853; - public static final int SetNameCardRsp = 22422; - public static final int SetOpenStateReq = 20702; - public static final int SetOpenStateRsp = 934; - public static final int SetPlayerBirthdayReq = 26479; - public static final int SetPlayerBirthdayRsp = 26814; - public static final int SetPlayerBornDataReq = 7992; - public static final int SetPlayerBornDataRsp = 22804; - public static final int SetPlayerHeadImageReq = 4071; - public static final int SetPlayerHeadImageRsp = 20979; - public static final int SetPlayerNameReq = 2665; - public static final int SetPlayerNameRsp = 25056; - public static final int SetPlayerPropReq = 25174; public static final int SetPlayerPropRsp = 1391; - public static final int SetPlayerSignatureReq = 771; - public static final int SetPlayerSignatureRsp = 28588; public static final int SetSceneWeatherAreaReq = 6203; public static final int SetSceneWeatherAreaRsp = 29445; - public static final int SetUpAvatarTeamReq = 5889; - public static final int SetUpAvatarTeamRsp = 8572; public static final int SetUpLunchBoxWidgetReq = 20055; public static final int SetUpLunchBoxWidgetRsp = 6360; - public static final int SetWidgetSlotReq = 21852; - public static final int SetWidgetSlotRsp = 21258; public static final int ShowClientGuideNotify = 8965; public static final int ShowClientTutorialNotify = 6463; - public static final int ShowCommonTipsNotify = 28414; - public static final int ShowMessageNotify = 20664; - public static final int ShowTemplateReminderNotify = 24864; public static final int SignInInfoReq = 1091; public static final int SignInInfoRsp = 1196; public static final int SignatureAuditConfigNotify = 9501; @@ -2227,8 +2344,6 @@ public final class PacketOpcodes { public static final int SingleRestartBrickBreakerRsp = 22220; public static final int SingleStartBrickBreakerReq = 22511; public static final int SingleStartBrickBreakerRsp = 20651; - public static final int SkipPlayerGameTimeReq = 22076; - public static final int SkipPlayerGameTimeRsp = 24529; public static final int SkyCrystalDetectorDataUpdateNotify = 5621; public static final int SocialDataNotify = 4307; public static final int SpiceActivityFinishMakeSpiceReq = 8503; @@ -2242,14 +2357,11 @@ public final class PacketOpcodes { public static final int StartArenaChallengeLevelRsp = 27893; public static final int StartBuoyantCombatGalleryReq = 103; public static final int StartBuoyantCombatGalleryRsp = 2642; - public static final int StartCoopPointReq = 22463; - public static final int StartCoopPointRsp = 1231; public static final int StartEffigyChallengeReq = 4800; public static final int StartEffigyChallengeRsp = 28896; public static final int StartFishingReq = 24205; public static final int StartFishingRsp = 27055; public static final int StartRogueDiaryPlayReq = 29988; - public static final int StartRogueDiaryPlayRsp = 3886; public static final int StartRogueDiaryRoomReq = 20500; public static final int StartRogueDiaryRoomRsp = 24237; public static final int StartRogueEliteCellChallengeReq = 24719; @@ -2259,9 +2371,6 @@ public final class PacketOpcodes { public static final int StopReminderNotify = 29994; public static final int StoreCustomDungeonReq = 24734; public static final int StoreCustomDungeonRsp = 28706; - public static final int StoreItemChangeNotify = 370; - public static final int StoreItemDelNotify = 28814; - public static final int StoreWeightLimitNotify = 22706; public static final int SubmitInferenceWordReq = 22181; public static final int SubmitInferenceWordRsp = 3679; public static final int SummerTimeFloatSignalPositionNotify = 9015; @@ -2286,8 +2395,6 @@ public final class PacketOpcodes { public static final int SumoSetNoSwitchPunishTimeNotify = 5911; public static final int SumoSwitchTeamReq = 21102; public static final int SumoSwitchTeamRsp = 28038; - public static final int SyncScenePlayTeamEntityNotify = 4915; - public static final int SyncTeamEntityNotify = 25071; public static final int TakeAchievementGoalRewardReq = 249; public static final int TakeAchievementGoalRewardRsp = 20302; public static final int TakeAchievementRewardReq = 20624; @@ -2296,18 +2403,12 @@ public final class PacketOpcodes { public static final int TakeAsterSpecialRewardRsp = 25347; public static final int TakeBackGivingItemReq = 21351; public static final int TakeBackGivingItemRsp = 20307; - public static final int TakeBattlePassMissionPointReq = 20580; - public static final int TakeBattlePassMissionPointRsp = 9060; - public static final int TakeBattlePassRewardReq = 28914; - public static final int TakeBattlePassRewardRsp = 25609; public static final int TakeCityReputationExploreRewardReq = 24844; public static final int TakeCityReputationExploreRewardRsp = 26493; public static final int TakeCityReputationLevelRewardReq = 5580; public static final int TakeCityReputationLevelRewardRsp = 9391; public static final int TakeCityReputationParentQuestReq = 26463; public static final int TakeCityReputationParentQuestRsp = 1428; - public static final int TakeCompoundOutputReq = 5837; - public static final int TakeCompoundOutputRsp = 28960; public static final int TakeCoopRewardReq = 23462; public static final int TakeCoopRewardRsp = 22350; public static final int TakeDeliveryDailyRewardReq = 28022; @@ -2318,8 +2419,6 @@ public final class PacketOpcodes { public static final int TakeEffigyRewardRsp = 1345; public static final int TakeFirstShareRewardReq = 21051; public static final int TakeFirstShareRewardRsp = 7609; - public static final int TakeFurnitureMakeReq = 28389; - public static final int TakeFurnitureMakeRsp = 6814; public static final int TakeHuntingOfferReq = 26500; public static final int TakeHuntingOfferRsp = 8846; public static final int TakeInvestigationRewardReq = 8462; @@ -2330,8 +2429,6 @@ public final class PacketOpcodes { public static final int TakeMaterialDeleteReturnRsp = 26975; public static final int TakeOfferingLevelRewardReq = 20499; public static final int TakeOfferingLevelRewardRsp = 1269; - public static final int TakePlayerLevelRewardReq = 4273; - public static final int TakePlayerLevelRewardRsp = 767; public static final int TakeRegionSearchRewardReq = 5375; public static final int TakeRegionSearchRewardRsp = 2889; public static final int TakeResinCardDailyRewardReq = 29342; @@ -2344,8 +2441,6 @@ public final class PacketOpcodes { public static final int TakeReunionSignInRewardRsp = 28118; public static final int TakeReunionWatcherRewardReq = 27039; public static final int TakeReunionWatcherRewardRsp = 5682; - public static final int TakeoffEquipReq = 23894; - public static final int TakeoffEquipRsp = 24431; public static final int TanukiTravelFinishGuideQuestNotify = 29894; public static final int TaskVarNotify = 21431; public static final int TeamChainDungeonInfoNotify = 22413; @@ -2355,37 +2450,20 @@ public final class PacketOpcodes { public static final int TeamChainRestartDungeonRsp = 6928; public static final int TeamChainTakeCostumeRewardReq = 24365; public static final int TeamChainTakeCostumeRewardRsp = 568; - public static final int TeamResonanceChangeNotify = 23566; public static final int ToTheMoonAddObstacleReq = 6113; public static final int ToTheMoonAddObstacleRsp = 6148; - public static final int ToTheMoonEnterSceneReq = 6144; - public static final int ToTheMoonEnterSceneRsp = 6130; public static final int ToTheMoonObstaclesModifyNotify = 6142; public static final int ToTheMoonPingNotify = 6154; public static final int ToTheMoonQueryPathReq = 6117; - public static final int ToTheMoonQueryPathRsp = 6191; public static final int ToTheMoonRemoveObstacleReq = 6197; public static final int ToTheMoonRemoveObstacleRsp = 6115; - public static final int TowerAllDataReq = 23009; - public static final int TowerAllDataRsp = 3897; - public static final int TowerBriefDataNotify = 28206; public static final int TowerBuffSelectReq = 8694; public static final int TowerBuffSelectRsp = 23137; - public static final int TowerCurLevelRecordChangeNotify = 2583; public static final int TowerDailyRewardProgressChangeNotify = 8485; - public static final int TowerEnterLevelReq = 21406; - public static final int TowerEnterLevelRsp = 26115; - public static final int TowerFloorRecordChangeNotify = 23989; - public static final int TowerGetFloorStarRewardReq = 5764; - public static final int TowerGetFloorStarRewardRsp = 24127; - public static final int TowerLevelEndNotify = 20886; - public static final int TowerLevelStarCondNotify = 2042; public static final int TowerMiddleLevelChangeTeamNotify = 2027; public static final int TowerRecordHandbookReq = 2953; - public static final int TowerRecordHandbookRsp = 27785; public static final int TowerSurrenderReq = 22082; public static final int TowerSurrenderRsp = 22267; - public static final int TowerTeamSelectReq = 2100; public static final int TowerTeamSelectRsp = 21023; public static final int TreasureMapBonusChallengeNotify = 23317; public static final int TreasureMapCurrencyNotify = 24210; @@ -2397,7 +2475,6 @@ public final class PacketOpcodes { public static final int TreasureMapRegionActiveNotify = 20683; public static final int TreasureMapRegionInfoNotify = 27963; public static final int TreasureSeelieCollectOrbsNotify = 28836; - public static final int TrialAvatarFirstPassDungeonNotify = 6009; public static final int TrialAvatarInDungeonIndexNotify = 25684; public static final int TriggerCreateGadgetToEquipPartNotify = 3153; public static final int TriggerRoguelikeCurseNotify = 26431; @@ -2405,56 +2482,34 @@ public final class PacketOpcodes { public static final int TriggerRoguelikeRuneRsp = 1039; public static final int TryCustomDungeonReq = 28599; public static final int TryCustomDungeonRsp = 9741; - public static final int TryEnterHomeReq = 26594; - public static final int TryEnterHomeRsp = 351; public static final int TryEnterNextRogueDiaryDungeonReq = 619; public static final int TryEnterNextRogueDiaryDungeonRsp = 28661; public static final int TryInterruptRogueDiaryDungeonReq = 23223; public static final int TryInterruptRogueDiaryDungeonRsp = 4919; public static final int UgcNotify = 24435; - public static final int UnfreezeGroupLimitNotify = 23739; - public static final int UnionCmdNotify = 21088; - public static final int UnlockAvatarTalentReq = 20169; - public static final int UnlockAvatarTalentRsp = 21745; public static final int UnlockCoopChapterReq = 27931; public static final int UnlockCoopChapterRsp = 3122; - public static final int UnlockNameCardNotify = 3896; public static final int UnlockPersonalLineReq = 1085; - public static final int UnlockPersonalLineRsp = 5048; - public static final int UnlockTransPointReq = 27465; - public static final int UnlockTransPointRsp = 21510; public static final int UnlockedFurnitureFormulaDataNotify = 28859; public static final int UnlockedFurnitureSuiteDataNotify = 21457; public static final int UnmarkEntityInMinMapNotify = 4510; - public static final int UpdateAbilityCreatedMovingPlatformNotify = 2608; public static final int UpdatePS4BlockListReq = 21934; public static final int UpdatePS4BlockListRsp = 5073; public static final int UpdatePS4FriendListNotify = 23862; public static final int UpdatePS4FriendListReq = 4656; public static final int UpdatePS4FriendListRsp = 5389; - public static final int UpdatePlayerShowAvatarListReq = 6950; - public static final int UpdatePlayerShowAvatarListRsp = 9339; - public static final int UpdatePlayerShowNameCardListReq = 25424; - public static final int UpdatePlayerShowNameCardListRsp = 5380; public static final int UpdateRedPointNotify = 21359; public static final int UpdateReunionWatcherNotify = 8205; public static final int UpdateSalvageBundleMarkReq = 20695; public static final int UpdateSalvageBundleMarkRsp = 22649; public static final int UpgradeRoguelikeShikigamiReq = 23123; public static final int UpgradeRoguelikeShikigamiRsp = 1133; - public static final int UseItemReq = 9155; - public static final int UseItemRsp = 5970; public static final int UseMiracleRingReq = 20849; public static final int UseMiracleRingRsp = 86; public static final int UseWidgetCreateGadgetReq = 2124; public static final int UseWidgetCreateGadgetRsp = 7117; public static final int UseWidgetRetractGadgetReq = 9147; public static final int UseWidgetRetractGadgetRsp = 20644; - public static final int VehicleInteractReq = 28312; - public static final int VehicleInteractRsp = 29349; - public static final int VehicleStaminaNotify = 6743; - public static final int ViewCodexReq = 25133; - public static final int ViewCodexRsp = 25216; public static final int ViewLanternProjectionLevelTipsReq = 29565; public static final int ViewLanternProjectionLevelTipsRsp = 20141; public static final int ViewLanternProjectionTipsReq = 6221; @@ -2487,28 +2542,14 @@ public final class PacketOpcodes { public static final int WatcherEventStageNotify = 1677; public static final int WatcherEventTypeNotify = 7059; public static final int WaterSpritePhaseFinishNotify = 22107; - public static final int WeaponAwakenReq = 23146; - public static final int WeaponAwakenRsp = 26318; - public static final int WeaponPromoteReq = 23298; - public static final int WeaponPromoteRsp = 715; - public static final int WeaponUpgradeReq = 9010; - public static final int WeaponUpgradeRsp = 7193; - public static final int WearEquipReq = 7563; - public static final int WearEquipRsp = 22727; public static final int WidgetActiveChangeNotify = 22991; public static final int WidgetCaptureAnimalReq = 1304; public static final int WidgetCaptureAnimalRsp = 23199; - public static final int WidgetCoolDownNotify = 27222; - public static final int WidgetDoBagReq = 2739; - public static final int WidgetDoBagRsp = 8212; - public static final int WidgetGadgetAllDataNotify = 6076; - public static final int WidgetGadgetDataNotify = 4861; public static final int WidgetGadgetDestroyNotify = 7666; public static final int WidgetQuickHitTreeReq = 26447; public static final int WidgetQuickHitTreeRsp = 1624; public static final int WidgetReportReq = 2271; public static final int WidgetReportRsp = 27403; - public static final int WidgetSlotChangeNotify = 26889; public static final int WidgetUpdateExtraCDReq = 24037; public static final int WidgetUpdateExtraCDRsp = 9991; public static final int WidgetUseAttachAbilityGroupChangeNotify = 5280; @@ -2517,8 +2558,6 @@ public final class PacketOpcodes { public static final int WindFieldGalleryInfoNotify = 4173; public static final int WindFieldRestartDungeonReq = 27756; public static final int WindFieldRestartDungeonRsp = 816; - public static final int WindSeedClientNotify = 28351; - public static final int WindSeedType1Notify = 3604; public static final int WindSeedType2Notify = 24421; public static final int WindSeedType3Notify = 5640; public static final int WinterCampAcceptAllGiveItemReq = 6397; @@ -2547,20 +2586,5 @@ public final class PacketOpcodes { public static final int WinterCampTriathlonRestartReq = 9024; public static final int WinterCampTriathlonRestartRsp = 27534; public static final int WinterCampTriathlonSettleNotify = 3692; - public static final int WorktopOptionNotify = 925; - public static final int WorldAllRoutineTypeNotify = 1912; - public static final int WorldChestOpenNotify = 9116; - public static final int WorldDataNotify = 813; - public static final int WorldOwnerBlossomBriefInfoNotify = 2494; public static final int WorldOwnerBlossomScheduleInfoNotify = 7500; - public static final int WorldOwnerDailyTaskNotify = 9896; - public static final int WorldPlayerDieNotify = 26320; - public static final int WorldPlayerInfoNotify = 2239; - public static final int WorldPlayerLocationNotify = 7085; - public static final int WorldPlayerRTTNotify = 421; - public static final int WorldPlayerReviveReq = 2639; - public static final int WorldPlayerReviveRsp = 3657; - public static final int WorldRoutineChangeNotify = 1471; - public static final int WorldRoutineTypeCloseNotify = 4128; - public static final int WorldRoutineTypeRefreshNotify = 26687; } From 16847e99d13d4a119526758f52da4c356fdd1384 Mon Sep 17 00:00:00 2001 From: HongchengQ Date: Thu, 3 Oct 2024 00:12:33 +0800 Subject: [PATCH 3/3] fix: build errors --- .../game/ability/AbilityManager.java | 47 +++++++------------ .../grasscutter/game/entity/EntityAvatar.java | 2 +- .../game/managers/SotSManager.java | 2 +- .../packet/send/PacketGachaWishRsp.java | 4 +- .../send/PacketTowerLevelStarCondNotify.java | 8 ++-- 5 files changed, 25 insertions(+), 38 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java index b5bef427651..3482876b517 100644 --- a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java +++ b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java @@ -222,20 +222,20 @@ public void onAbilityInvoke(AbilityInvokeEntry invoke) throws Exception { } switch (invoke.getArgumentType()) { - case ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM -> this.handleOverrideParam(invoke); - case ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP -> this.handleReinitOverrideMap(invoke); - case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE -> this.handleModifierChange(invoke); - case ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA -> this.handleMixinCostStamina(invoke); - case ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL -> this.handleGenerateElemBall(invoke); - case ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE -> this.handleGlobalFloatValue(invoke); - case ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE -> this - .handleModifierDurabilityChange(invoke); - case ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY -> this.handleAddNewAbility(invoke); - case ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_SETATE -> this.handleKillState(invoke); + case ABILITY_META_OVERRIDE_PARAM -> this.handleOverrideParam(invoke); + case ABILITY_META_REINIT_OVERRIDEMAP -> this.handleReinitOverrideMap(invoke); + case ABILITY_META_MODIFIER_CHANGE -> this.handleModifierChange(invoke); + case ABILITY_MIXIN_COST_STAMINA -> this.handleMixinCostStamina(invoke); + case ABILITY_ACTION_GENERATE_ELEM_BALL -> this.handleGenerateElemBall(invoke); + case ABILITY_META_GLOBAL_FLOAT_VALUE -> this.handleGlobalFloatValue(invoke); + case ABILITY_META_MODIFIER_DURABILITY_CHANGE -> this + .handleModifierDurabilityChange(invoke); + case ABILITY_META_ADD_NEW_ABILITY -> this.handleAddNewAbility(invoke); + case ABILITY_META_SET_KILLED_SETATE -> this.handleKillState(invoke); default -> { if (DebugConstants.LOG_MISSING_ABILITIES) { Grasscutter.getLogger() - .trace("Missing invoke handler for ability {}.", invoke.getArgumentType().name()); + .trace("Missing invoke handler for ability {}.", invoke.getArgumentType().name()); } } } @@ -361,12 +361,6 @@ public void onSkillEnd(Player player) { } private void setAbilityOverrideValue(Ability ability, AbilityScalarValueEntry valueChange) { - if (valueChange.getValueType() != AbilityScalarType.ABILITY_SCALAR_TYPE_FLOAT) { - Grasscutter.getLogger().trace("Scalar type not supported: {}", valueChange.getValueType()); - - return; - } - if (!valueChange.getKey().hasStr()) { Grasscutter.getLogger().trace("TODO: Calculate all the ability value hashes"); @@ -542,12 +536,12 @@ private void handleGenerateElemBall(AbilityInvokeEntry invoke) throws InvalidProtocolBufferException {} private void handleGlobalFloatValue(AbilityInvokeEntry invoke) - throws InvalidProtocolBufferException { + throws InvalidProtocolBufferException { var entity = this.player.getScene().getEntityById(invoke.getEntityId()); if (entity == null) return; var entry = AbilityScalarValueEntry.parseFrom(invoke.getAbilityData()); - if (entry == null || !entry.hasFloatValue()) return; + if (entry == null) return; String key = null; if (entry.getKey().hasStr()) key = entry.getKey().getStr(); @@ -557,17 +551,10 @@ else if (entry.getKey().hasHash()) if (key == null) return; if (key.startsWith("SGV_")) return; // Server does not allow to change this variables I think - switch (entry.getValueType().getNumber()) { - case AbilityScalarType.ABILITY_SCALAR_TYPE_FLOAT_VALUE -> { - if (!Float.isNaN(entry.getFloatValue())) - entity.getGlobalAbilityValues().put(key, entry.getFloatValue()); - } - case AbilityScalarType.ABILITY_SCALAR_TYPE_UINT_VALUE -> entity - .getGlobalAbilityValues() - .put(key, (float) entry.getUintValue()); - default -> { - return; - } + if (!Float.isNaN(entry.getFloatValue())) { + entity.getGlobalAbilityValues().put(key, entry.getFloatValue()); + } else { + return; } entity.onAbilityValueUpdate(); diff --git a/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java b/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java index 2bff768bae6..af038a0d4df 100644 --- a/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java +++ b/src/main/java/emu/grasscutter/game/entity/EntityAvatar.java @@ -160,7 +160,7 @@ public float heal(float amount, boolean mute) { mute ? PropChangeReason.PROP_CHANGE_REASON_NONE : PropChangeReason.PROP_CHANGE_REASON_ABILITY, - ChangeHpReason.CHANGE_HP_REASON_ADD_ABILITY)); + ChangeHpReason.CHANGE_HP_ADD_ABILITY)); } return healed; diff --git a/src/main/java/emu/grasscutter/game/managers/SotSManager.java b/src/main/java/emu/grasscutter/game/managers/SotSManager.java index 6427de18569..0b005b9bb41 100644 --- a/src/main/java/emu/grasscutter/game/managers/SotSManager.java +++ b/src/main/java/emu/grasscutter/game/managers/SotSManager.java @@ -142,7 +142,7 @@ public void checkAndHealAvatar(EntityAvatar entity) { ((float) needHP / 100), List.of(3), PropChangeReason.PROP_CHANGE_REASON_STATUE_RECOVER, - ChangeHpReason.CHANGE_HP_REASON_ADD_STATUE)); + ChangeHpReason.CHANGE_HP_ADD_STATUE)); player .getSession() .send(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP)); diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java index c8a7049370d..f654d2f7e8a 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGachaWishRsp.java @@ -14,8 +14,8 @@ public PacketGachaWishRsp( .setGachaType(gachaType) .setGachaScheduleId(scheduleId) .setWishItemId(itemId) - .setWishProgress(progress) - .setWishMaxProgress(maxProgress) + .setTenCostItemId(progress) + .setGachaSortId(maxProgress) .build(); this.setData(proto); diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java index 3c5026744f7..168aaeb3497 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketTowerLevelStarCondNotify.java @@ -17,10 +17,10 @@ public PacketTowerLevelStarCondNotify(int floorId, int levelIndex, int lostStar) // If these are still obfuscated in the next client version, // just set all int fields to the star (1 <= star <= 3) // that failed and set all boolean fields to true. - .setNGHNFHCLFBH(lostStar) - .setIBGHBFANCBK(true) - .setOILLLBMMABH(true) - .setOMOECEGOALC(lostStar) + .setCondValue(lostStar) + .setIsFail(true) + .setIsPause(true) + .setStarCondIndex(lostStar) .build()); } else { proto